namespace Friendica\Protocol;
use Friendica\App;
+use Friendica\Content\OEmbed;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Contact;
-use Friendica\Object\Profile;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Term;
+use Friendica\Model\User;
+use Friendica\Object\Image;
use Friendica\Protocol\OStatus;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
use Friendica\Util\XML;
-
use dba;
use DOMDocument;
-use DomXPath;
+use DOMXPath;
+use HTMLPurifier;
+use HTMLPurifier_Config;
+require_once 'boot.php';
+require_once 'include/dba.php';
require_once "include/enotify.php";
-require_once "include/threads.php";
require_once "include/items.php";
-require_once "include/tags.php";
-require_once "include/files.php";
require_once "include/event.php";
require_once "include/text.php";
-require_once "include/oembed.php";
require_once "include/html2bbcode.php";
require_once "include/bbcode.php";
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
if (! count($items)) {
return trim($doc->saveXML());
$contact = $r[0];
include_once 'include/security.php';
- $groups = init_groups_visitor($contact['id']);
+ $groups = Group::getIdsByContactId($contact['id']);
if (count($groups)) {
for ($x = 0; $x < count($groups); $x ++)
}
}
- $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
+ $check_date = DateTimeFormat::utc($last_update);
$r = q(
"SELECT `item`.*, `item`.`id` AS `item_id`,
$author = "author";
}
- $root = self::add_header($doc, $owner, $author, $alternatelink, true);
+ $root = self::addHeader($doc, $owner, $author, $alternatelink, true);
/// @TODO This hook can't work anymore
- // call_hooks('atom_feed', $atom);
+ // Addon::callHooks('atom_feed', $atom);
if (!DBM::is_result($items) || $onlyheader) {
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
$atom = trim($doc->saveXML());
- call_hooks('atom_feed_end', $atom);
+ Addon::callHooks('atom_feed_end', $atom);
return $atom;
}
$items = $r;
$item = $r[0];
- $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'])
- );
-
- if (!DBM::is_result($r)) {
- killme();
+ if ($item['uid'] != 0) {
+ $owner = User::getOwnerDataById($item['uid']);
+ if (!$owner) {
+ killme();
+ }
+ } else {
+ $owner = ['uid' => 0, 'nick' => 'feed-item'];
}
- $owner = $r[0];
-
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$type = 'html';
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- //$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ //$root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
foreach ($items as $item) {
$entry = self::entry($doc, $type, $item, $owner, true, 0);
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$mail = $doc->createElement("dfrn:mail");
$sender = $doc->createElement("dfrn:sender");
- XML::add_element($doc, $sender, "dfrn:name", $owner['name']);
- XML::add_element($doc, $sender, "dfrn:uri", $owner['url']);
- XML::add_element($doc, $sender, "dfrn:avatar", $owner['thumb']);
+ XML::addElement($doc, $sender, "dfrn:name", $owner['name']);
+ XML::addElement($doc, $sender, "dfrn:uri", $owner['url']);
+ XML::addElement($doc, $sender, "dfrn:avatar", $owner['thumb']);
$mail->appendChild($sender);
- XML::add_element($doc, $mail, "dfrn:id", $item['uri']);
- XML::add_element($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
- XML::add_element($doc, $mail, "dfrn:sentdate", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME));
- XML::add_element($doc, $mail, "dfrn:subject", $item['title']);
- XML::add_element($doc, $mail, "dfrn:content", $item['body']);
+ XML::addElement($doc, $mail, "dfrn:id", $item['uri']);
+ XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
+ XML::addElement($doc, $mail, "dfrn:sentdate", DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM));
+ XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
+ XML::addElement($doc, $mail, "dfrn:content", $item['body']);
$root->appendChild($mail);
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$suggest = $doc->createElement("dfrn:suggest");
- XML::add_element($doc, $suggest, "dfrn:url", $item['url']);
- XML::add_element($doc, $suggest, "dfrn:name", $item['name']);
- XML::add_element($doc, $suggest, "dfrn:photo", $item['photo']);
- XML::add_element($doc, $suggest, "dfrn:request", $item['request']);
- XML::add_element($doc, $suggest, "dfrn:note", $item['note']);
+ XML::addElement($doc, $suggest, "dfrn:url", $item['url']);
+ XML::addElement($doc, $suggest, "dfrn:name", $item['name']);
+ XML::addElement($doc, $suggest, "dfrn:photo", $item['photo']);
+ XML::addElement($doc, $suggest, "dfrn:request", $item['request']);
+ XML::addElement($doc, $suggest, "dfrn:note", $item['note']);
$root->appendChild($suggest);
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = Config::get('system', 'site_pubkey');
if (! $pubkey) {
- $res = new_keypair(1024);
+ $res = Crypto::newKeypair(1024);
Config::set('system', 'site_prvkey', $res['prvkey']);
Config::set('system', 'site_pubkey', $res['pubkey']);
}
WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
$uid
);
- $photos = array();
- $ext = Photo::supportedTypes();
+ $photos = [];
+ $ext = Image::supportedTypes();
foreach ($rp as $p) {
$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$relocate = $doc->createElement("dfrn:relocate");
- XML::add_element($doc, $relocate, "dfrn:url", $owner['url']);
- XML::add_element($doc, $relocate, "dfrn:name", $owner['name']);
- XML::add_element($doc, $relocate, "dfrn:addr", $owner['addr']);
- XML::add_element($doc, $relocate, "dfrn:avatar", $owner['avatar']);
- XML::add_element($doc, $relocate, "dfrn:photo", $photos[4]);
- XML::add_element($doc, $relocate, "dfrn:thumb", $photos[5]);
- XML::add_element($doc, $relocate, "dfrn:micro", $photos[6]);
- XML::add_element($doc, $relocate, "dfrn:request", $owner['request']);
- XML::add_element($doc, $relocate, "dfrn:confirm", $owner['confirm']);
- XML::add_element($doc, $relocate, "dfrn:notify", $owner['notify']);
- XML::add_element($doc, $relocate, "dfrn:poll", $owner['poll']);
- XML::add_element($doc, $relocate, "dfrn:sitepubkey", Config::get('system','site_pubkey'));
+ XML::addElement($doc, $relocate, "dfrn:url", $owner['url']);
+ XML::addElement($doc, $relocate, "dfrn:name", $owner['name']);
+ XML::addElement($doc, $relocate, "dfrn:addr", $owner['addr']);
+ XML::addElement($doc, $relocate, "dfrn:avatar", $owner['avatar']);
+ XML::addElement($doc, $relocate, "dfrn:photo", $photos[4]);
+ XML::addElement($doc, $relocate, "dfrn:thumb", $photos[5]);
+ XML::addElement($doc, $relocate, "dfrn:micro", $photos[6]);
+ XML::addElement($doc, $relocate, "dfrn:request", $owner['request']);
+ XML::addElement($doc, $relocate, "dfrn:confirm", $owner['confirm']);
+ XML::addElement($doc, $relocate, "dfrn:notify", $owner['notify']);
+ XML::addElement($doc, $relocate, "dfrn:poll", $owner['poll']);
+ XML::addElement($doc, $relocate, "dfrn:sitepubkey", Config::get('system', 'site_pubkey'));
$root->appendChild($relocate);
* @return object XML root object
* @todo Add type-hints
*/
- private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false)
+ private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
{
if ($alternatelink == "") {
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- XML::add_element($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
- XML::add_element($doc, $root, "title", $owner["name"]);
+ XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
+ XML::addElement($doc, $root, "title", $owner["name"]);
- $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
- XML::add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
+ $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION];
+ XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
- $attributes = array("rel" => "license", "href" => "http://creativecommons.org/licenses/by/3.0/");
- XML::add_element($doc, $root, "link", "", $attributes);
+ $attributes = ["rel" => "license", "href" => "http://creativecommons.org/licenses/by/3.0/"];
+ XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $alternatelink);
- XML::add_element($doc, $root, "link", "", $attributes);
+ $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $alternatelink];
+ XML::addElement($doc, $root, "link", "", $attributes);
if ($public) {
// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
OStatus::hublinks($doc, $root, $owner["nick"]);
- $attributes = array("rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- XML::add_element($doc, $root, "link", "", $attributes);
+ $attributes = ["rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
+ XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- XML::add_element($doc, $root, "link", "", $attributes);
+ $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
+ XML::addElement($doc, $root, "link", "", $attributes);
- $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- XML::add_element($doc, $root, "link", "", $attributes);
+ $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]];
+ XML::addElement($doc, $root, "link", "", $attributes);
}
// For backward compatibility we keep this element
if ($owner['page-flags'] == PAGE_COMMUNITY) {
- XML::add_element($doc, $root, "dfrn:community", 1);
+ XML::addElement($doc, $root, "dfrn:community", 1);
}
// The former element is replaced by this one
- XML::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
+ XML::addElement($doc, $root, "dfrn:account_type", $owner["account-type"]);
/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
- XML::add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+ XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
- $author = self::add_author($doc, $owner, $authorelement, $public);
+ $author = self::addAuthor($doc, $owner, $authorelement, $public);
$root->appendChild($author);
return $root;
/**
* @brief Adds the author element in the header for the DFRN protocol
*
- * @param object $doc XML document
- * @param array $owner Owner record
- * @param string $authorelement Element name for the author
+ * @param object $doc XML document
+ * @param array $owner Owner record
+ * @param string $authorelement Element name for the author
+ * @param boolean $public boolean
*
* @return object XML author object
* @todo Add type-hints
*/
- private static function add_author($doc, $owner, $authorelement, $public)
+ private static function addAuthor($doc, $owner, $authorelement, $public)
{
// Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
$r = q(
$author = $doc->createElement($authorelement);
- $namdate = datetime_convert('UTC', 'UTC', $owner['name-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);
+ $namdate = DateTimeFormat::utc($owner['name-date'].'+00:00', DateTimeFormat::ATOM);
+ $uridate = DateTimeFormat::utc($owner['uri-date'].'+00:00', DateTimeFormat::ATOM);
+ $picdate = DateTimeFormat::utc($owner['avatar-date'].'+00:00', DateTimeFormat::ATOM);
- $attributes = array();
+ $attributes = [];
if (!$public || !$hidewall) {
- $attributes = array("dfrn:updated" => $namdate);
+ $attributes = ["dfrn:updated" => $namdate];
}
- XML::add_element($doc, $author, "name", $owner["name"], $attributes);
- XML::add_element($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
- XML::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
+ XML::addElement($doc, $author, "name", $owner["name"], $attributes);
+ XML::addElement($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
+ XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
- $attributes = array("rel" => "photo", "type" => "image/jpeg",
- "media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
+ $attributes = ["rel" => "photo", "type" => "image/jpeg",
+ "media:width" => 175, "media:height" => 175, "href" => $owner['photo']];
if (!$public || !$hidewall) {
$attributes["dfrn:updated"] = $picdate;
}
- XML::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
$attributes["rel"] = "avatar";
- XML::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
if ($hidewall) {
- XML::add_element($doc, $author, "dfrn:hide", "true");
+ XML::addElement($doc, $author, "dfrn:hide", "true");
}
// The following fields will only be generated if the data isn't meant for a public feed
$birthday = feed_birthday($owner['uid'], $owner['timezone']);
if ($birthday) {
- XML::add_element($doc, $author, "dfrn:birthday", $birthday);
+ XML::addElement($doc, $author, "dfrn:birthday", $birthday);
}
// Only show contact details when we are allowed to
if (DBM::is_result($r)) {
$profile = $r[0];
- XML::add_element($doc, $author, "poco:displayName", $profile["name"]);
- XML::add_element($doc, $author, "poco:updated", $namdate);
+ XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
+ XML::addElement($doc, $author, "poco:updated", $namdate);
if (trim($profile["dob"]) > '0001-01-01') {
- XML::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
+ XML::addElement($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
}
- XML::add_element($doc, $author, "poco:note", $profile["about"]);
- XML::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]);
+ XML::addElement($doc, $author, "poco:note", $profile["about"]);
+ XML::addElement($doc, $author, "poco:preferredUsername", $profile["nickname"]);
$savetz = date_default_timezone_get();
date_default_timezone_set($profile["timezone"]);
- XML::add_element($doc, $author, "poco:utcOffset", date("P"));
+ XML::addElement($doc, $author, "poco:utcOffset", date("P"));
date_default_timezone_set($savetz);
if (trim($profile["homepage"]) != "") {
$urls = $doc->createElement("poco:urls");
- XML::add_element($doc, $urls, "poco:type", "homepage");
- XML::add_element($doc, $urls, "poco:value", $profile["homepage"]);
- XML::add_element($doc, $urls, "poco:primary", "true");
+ XML::addElement($doc, $urls, "poco:type", "homepage");
+ XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
+ XML::addElement($doc, $urls, "poco:primary", "true");
$author->appendChild($urls);
}
$keywords = explode(",", $profile["pub_keywords"]);
foreach ($keywords as $keyword) {
- XML::add_element($doc, $author, "poco:tags", trim($keyword));
+ XML::addElement($doc, $author, "poco:tags", trim($keyword));
}
}
if (trim($profile["xmpp"]) != "") {
$ims = $doc->createElement("poco:ims");
- XML::add_element($doc, $ims, "poco:type", "xmpp");
- XML::add_element($doc, $ims, "poco:value", $profile["xmpp"]);
- XML::add_element($doc, $ims, "poco:primary", "true");
+ XML::addElement($doc, $ims, "poco:type", "xmpp");
+ XML::addElement($doc, $ims, "poco:value", $profile["xmpp"]);
+ XML::addElement($doc, $ims, "poco:primary", "true");
$author->appendChild($ims);
}
if (trim($profile["locality"].$profile["region"].$profile["country-name"]) != "") {
$element = $doc->createElement("poco:address");
- XML::add_element($doc, $element, "poco:formatted", Profile::formatLocation($profile));
+ XML::addElement($doc, $element, "poco:formatted", Profile::formatLocation($profile));
if (trim($profile["locality"]) != "") {
- XML::add_element($doc, $element, "poco:locality", $profile["locality"]);
+ XML::addElement($doc, $element, "poco:locality", $profile["locality"]);
}
if (trim($profile["region"]) != "") {
- XML::add_element($doc, $element, "poco:region", $profile["region"]);
+ XML::addElement($doc, $element, "poco:region", $profile["region"]);
}
if (trim($profile["country-name"]) != "") {
- XML::add_element($doc, $element, "poco:country", $profile["country-name"]);
+ XML::addElement($doc, $element, "poco:country", $profile["country-name"]);
}
$author->appendChild($element);
* @return object XML author object
* @todo Add type-hints
*/
- private static function add_entry_author($doc, $element, $contact_url, $item)
+ private static function addEntryAuthor($doc, $element, $contact_url, $item)
{
$contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
$author = $doc->createElement($element);
- XML::add_element($doc, $author, "name", $contact["name"]);
- XML::add_element($doc, $author, "uri", $contact["url"]);
- XML::add_element($doc, $author, "dfrn:handle", $contact["addr"]);
+ XML::addElement($doc, $author, "name", $contact["name"]);
+ XML::addElement($doc, $author, "uri", $contact["url"]);
+ XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
/// @Todo
/// - Check real image type and image size
/// - Check which of these boths elements we should use
- $attributes = array(
+ $attributes = [
"rel" => "photo",
"type" => "image/jpeg",
"media:width" => 80,
"media:height" => 80,
- "href" => $contact["photo"]);
- XML::add_element($doc, $author, "link", "", $attributes);
+ "href" => $contact["photo"]];
+ XML::addElement($doc, $author, "link", "", $attributes);
- $attributes = array(
+ $attributes = [
"rel" => "avatar",
"type" => "image/jpeg",
"media:width" => 80,
"media:height" => 80,
- "href" => $contact["photo"]);
- XML::add_element($doc, $author, "link", "", $attributes);
+ "href" => $contact["photo"]];
+ XML::addElement($doc, $author, "link", "", $attributes);
return $author;
}
* @return object XML activity object
* @todo Add type-hints
*/
- private static function create_activity($doc, $element, $activity)
+ private static function createActivity($doc, $element, $activity)
{
if ($activity) {
$entry = $doc->createElement($element);
- $r = parse_xml_string($activity, false);
+ $r = XML::parseString($activity, false);
if (!$r) {
return false;
}
if ($r->type) {
- XML::add_element($doc, $entry, "activity:object-type", $r->type);
+ XML::addElement($doc, $entry, "activity:object-type", $r->type);
}
if ($r->id) {
- XML::add_element($doc, $entry, "id", $r->id);
+ XML::addElement($doc, $entry, "id", $r->id);
}
if ($r->title) {
- XML::add_element($doc, $entry, "title", $r->title);
+ XML::addElement($doc, $entry, "title", $r->title);
}
if ($r->link) {
$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
// XML does need a single element as root element so we add a dummy element here
- $data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
+ $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
if (is_object($data)) {
- foreach ($data->link AS $link) {
- $attributes = array();
+ foreach ($data->link as $link) {
+ $attributes = [];
foreach ($link->attributes() as $parameter => $value) {
$attributes[$parameter] = $value;
}
- XML::add_element($doc, $entry, "link", "", $attributes);
+ XML::addElement($doc, $entry, "link", "", $attributes);
}
}
} else {
- $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
- XML::add_element($doc, $entry, "link", "", $attributes);
+ $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $r->link];
+ XML::addElement($doc, $entry, "link", "", $attributes);
}
}
if ($r->content) {
- XML::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+ XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]);
}
return $entry;
* @return object XML attachment object
* @todo Add type-hints
*/
- private static function get_attachment($doc, $root, $item)
+ private static function getAttachment($doc, $root, $item)
{
$arr = explode('[/attach],', $item['attach']);
if (count($arr)) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
- $attributes = array("rel" => "enclosure",
+ $attributes = ["rel" => "enclosure",
"href" => $matches[1],
- "type" => $matches[3]);
+ "type" => $matches[3]];
if (intval($matches[2])) {
$attributes["length"] = intval($matches[2]);
$attributes["title"] = trim($matches[4]);
}
- XML::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($doc, $root, "link", "", $attributes);
}
}
}
*/
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
{
- $mentioned = array();
+ $mentioned = [];
if (!$item['parent']) {
return;
}
if ($item['deleted']) {
- $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);
+ $attributes = ["ref" => $item['uri'], "when" => DateTimeFormat::utc($item['edited'] . '+00:00', DateTimeFormat::ATOM)];
+ return XML::createElement($doc, "at:deleted-entry", "", $attributes);
}
if (!$single) {
}
if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
- $body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
+ $body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
} else {
$body = $item['body'];
}
// Remove the abstract element. It is only locally important.
- $body = remove_abstract($body);
+ $body = BBCode::stripAbstract($body);
if ($type == 'html') {
$htmlbody = $body;
$htmlbody = bbcode($htmlbody, false, false, 7);
}
- $author = self::add_entry_author($doc, "author", $item["author-link"], $item);
+ $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
$entry->appendChild($author);
- $dfrnowner = self::add_entry_author($doc, "dfrn:owner", $item["owner-link"], $item);
+ $dfrnowner = self::addEntryAuthor($doc, "dfrn:owner", $item["owner-link"], $item);
$entry->appendChild($dfrnowner);
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$parent = q("SELECT `guid`,`plink` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", dbesc($parent_item), intval($item['uid']));
- $attributes = array("ref" => $parent_item, "type" => "text/html",
+ $attributes = ["ref" => $parent_item, "type" => "text/html",
"href" => $parent[0]['plink'],
- "dfrn:diaspora_guid" => $parent[0]['guid']);
- XML::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+ "dfrn:diaspora_guid" => $parent[0]['guid']];
+ XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
}
// Add conversation data. This is used for OStatus
}
}
- $attributes = array(
+ $attributes = [
"href" => $conversation_href,
- "ref" => $conversation_uri);
+ "ref" => $conversation_uri];
- XML::add_element($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
+ XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
- XML::add_element($doc, $entry, "id", $item["uri"]);
- XML::add_element($doc, $entry, "title", $item["title"]);
+ XML::addElement($doc, $entry, "id", $item["uri"]);
+ XML::addElement($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::addElement($doc, $entry, "published", DateTimeFormat::utc($item["created"] . "+00:00", DateTimeFormat::ATOM));
+ XML::addElement($doc, $entry, "updated", DateTimeFormat::utc($item["edited"] . "+00:00", DateTimeFormat::ATOM));
// "dfrn:env" is used to read the content
- XML::add_element($doc, $entry, "dfrn:env", base64url_encode($body, true));
+ XML::addElement($doc, $entry, "dfrn:env", base64url_encode($body, true));
// The "content" field is not read by the receiver. We could remove it when the type is "text"
// We keep it at the moment, maybe there is some old version that doesn't read "dfrn:env"
- XML::add_element($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type));
+ XML::addElement($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), ["type" => $type]);
// We save this value in "plink". Maybe we should read it from there as well?
- XML::add_element(
+ XML::addElement(
$doc,
$entry,
"link",
"",
- array("rel" => "alternate", "type" => "text/html",
- "href" => System::baseUrl() . "/display/" . $item["guid"])
+ ["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
if ($comment) {
- XML::add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+ XML::addElement($doc, $entry, "dfrn:comment-allow", 1);
}
if ($item['location']) {
- XML::add_element($doc, $entry, "dfrn:location", $item['location']);
+ XML::addElement($doc, $entry, "dfrn:location", $item['location']);
}
if ($item['coord']) {
- XML::add_element($doc, $entry, "georss:point", $item['coord']);
+ XML::addElement($doc, $entry, "georss:point", $item['coord']);
}
if (($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
- XML::add_element($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
+ XML::addElement($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
}
if ($item['extid']) {
- XML::add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ XML::addElement($doc, $entry, "dfrn:extid", $item['extid']);
}
if ($item['bookmark']) {
- XML::add_element($doc, $entry, "dfrn:bookmark", "true");
+ XML::addElement($doc, $entry, "dfrn:bookmark", "true");
}
if ($item['app']) {
- XML::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+ XML::addElement($doc, $entry, "statusnet:notice_info", "", ["local_id" => $item['id'], "source" => $item['app']]);
}
- XML::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
+ XML::addElement($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
// The signed text contains the content in Markdown, the sender handle and the signatur for the content
// It is needed for relayed comments to Diaspora.
if ($item['signed_text']) {
- $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
- XML::add_element($doc, $entry, "dfrn:diaspora_signature", $sign);
+ $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer']]));
+ XML::addElement($doc, $entry, "dfrn:diaspora_signature", $sign);
}
- XML::add_element($doc, $entry, "activity:verb", construct_verb($item));
+ XML::addElement($doc, $entry, "activity:verb", self::constructVerb($item));
if ($item['object-type'] != "") {
- XML::add_element($doc, $entry, "activity:object-type", $item['object-type']);
+ XML::addElement($doc, $entry, "activity:object-type", $item['object-type']);
} elseif ($item['id'] == $item['parent']) {
- XML::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+ XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
} else {
- XML::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
}
- $actobj = self::create_activity($doc, "activity:object", $item['object']);
+ $actobj = self::createActivity($doc, "activity:object", $item['object']);
if ($actobj) {
$entry->appendChild($actobj);
}
- $actarg = self::create_activity($doc, "activity:target", $item['target']);
+ $actarg = self::createActivity($doc, "activity:target", $item['target']);
if ($actarg) {
$entry->appendChild($actarg);
}
- $tags = item_getfeedtags($item);
+ $tags = Item::getFeedTags($item);
if (count($tags)) {
foreach ($tags as $t) {
if (($type != 'html') || ($t[0] != "@")) {
- XML::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+ XML::addElement($doc, $entry, "category", "", ["scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]]);
}
}
}
);
if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
- XML::add_element(
+ XML::addElement(
$doc,
$entry,
"link",
"",
- array("rel" => "mentioned",
+ ["rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
- "href" => $mention)
+ "href" => $mention]
);
} else {
- XML::add_element(
+ XML::addElement(
$doc,
$entry,
"link",
"",
- array("rel" => "mentioned",
+ ["rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
- "href" => $mention)
+ "href" => $mention]
);
}
}
- self::get_attachment($doc, $entry, $item);
+ self::getAttachment($doc, $entry, $item);
return $entry;
}
*
* @return string encrypted data
*/
- private static function aes_encrypt($data, $key)
+ private static function aesEncrypt($data, $key)
{
return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
*
* @return string decrypted data
*/
- public static function aes_decrypt($encrypted, $key)
+ public static function aesDecrypt($encrypted, $key)
{
return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
logger('dfrn_deliver: ' . $url);
- $ret = z_fetch_url($url);
+ $ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return -2; // timed out
return 3;
}
- $res = parse_xml_string($xml);
+ $res = XML::parseString($xml);
if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
return (($res->status) ? $res->status : 3);
}
- $postvars = array();
+ $postvars = [];
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
$challenge = hex2bin((string) $res->challenge);
$perm = (($res->perm) ? $res->perm : null);
switch ($rino_remote_version) {
case 1:
- // Deprecated rino version!
$key = openssl_random_pseudo_bytes(16);
- $data = self::aes_encrypt($postvars['data'], $key);
- break;
- case 2:
- // RINO 2 based on php-encryption
- try {
- $key = \Crypto::createNewRandomKey();
- } catch (\CryptoTestFailedException $ex) {
- logger('Cannot safely create a key');
- return -4;
- } catch (\CannotPerformOperationException $ex) {
- logger('Cannot safely create a key');
- return -5;
- }
- try {
- $data = \Crypto::encrypt($postvars['data'], $key);
- } catch (\CryptoTestFailedException $ex) {
- logger('Cannot safely perform encryption');
- return -6;
- } catch (\CannotPerformOperationException $ex) {
- logger('Cannot safely perform encryption');
- return -7;
- }
+ $data = self::aesEncrypt($postvars['data'], $key);
break;
default:
logger("rino: invalid requested version '$rino_remote_version'");
$postvars['rino'] = $rino_remote_version;
$postvars['data'] = bin2hex($data);
- //logger('rino: sent key = ' . $key, LOGGER_DEBUG);
-
-
if ($dfrn_version >= 2.1) {
if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
- $xml = post_url($contact['notify'], $postvars);
+ $xml = Network::post($contact['notify'], $postvars);
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
Contact::unmarkForArchival($contact);
}
- $res = parse_xml_string($xml);
+ $res = XML::parseString($xml);
if (!isset($res->status)) {
return -11;
*
* @param array $contact Contact record
* @param string $birthday Birthday of the contact
+ * @return void
* @todo Add array type-hint for $contact
*/
- private static function birthday_event($contact, $birthday)
+ private static function birthdayEvent($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",
intval($contact["uid"]),
intval($contact["id"]),
- dbesc(datetime_convert("UTC", "UTC", $birthday)),
+ dbesc(DateTimeFormat::utc($birthday)),
dbesc("birthday")
);
logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
- $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
- $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ;
+ $bdtext = L10n::t("%s\'s birthday", $contact["name"]);
+ $bdtext2 = L10n::t("Happy Birthday %s", " [url=".$contact["url"]."]".$contact["name"]."[/url]");
$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(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utcNow()),
+ dbesc(DateTimeFormat::utc($birthday)),
+ dbesc(DateTimeFormat::utc($birthday . " + 1 day ")),
dbesc($bdtext),
dbesc($bdtext2),
dbesc("birthday")
* @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 string $xml optional, default empty
*
- * @return Returns an array with relevant data of the author
+ * @return array Relevant data of the author
* @todo Find good type-hints for all parameter
*/
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
{
- $author = array();
+ $author = [];
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
}
// Until now we aren't serving different sizes - but maybe later
- $avatarlist = array();
+ $avatarlist = [];
/// @todo check if "avatar" or "photo" would be the best field in the specification
$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
- foreach ($avatars AS $avatar) {
+ foreach ($avatars as $avatar) {
$href = "";
$width = 0;
- foreach ($avatar->attributes AS $attributes) {
+ foreach ($avatar->attributes as $attributes) {
/// @TODO Rewrite these similar if () to one switch
if ($attributes->name == "href") {
$href = $attributes->textContent;
if (DBM::is_result($r) && !$onlyfetch) {
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 = ["url" => $contact["url"]];
// When was the last change to name or uri?
$name_element = $xpath->query($element . "/atom:name", $context)->item(0);
- foreach ($name_element->attributes AS $attributes) {
+ foreach ($name_element->attributes as $attributes) {
if ($attributes->name == "updated") {
$poco["name-date"] = $attributes->textContent;
}
}
$link_element = $xpath->query($element . "/atom:link", $context)->item(0);
- foreach ($link_element->attributes AS $attributes) {
+ foreach ($link_element->attributes as $attributes) {
if ($attributes->name == "updated") {
$poco["uri-date"] = $attributes->textContent;
}
}
// Save the keywords into the contact table
- $tags = array();
+ $tags = [];
$tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
- foreach ($tagelements AS $tag) {
+ foreach ($tagelements as $tag) {
$tags[$tag->nodeValue] = $tag->nodeValue;
}
// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
$value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
- if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) {
+ if (!in_array($value, ["", "0000-00-00", "0001-01-01"])) {
$bdyear = date("Y");
$value = str_replace("0000", $bdyear, $value);
$contact = array_merge($contact, $poco);
if ($old_bdyear != $contact["bdyear"]) {
- self::birthday_event($contact, $birthday);
+ self::birthdayEvent($contact, $birthday);
}
// Get all field names
- $fields = array();
- foreach ($r[0] AS $field => $data) {
+ $fields = [];
+ foreach ($r[0] as $field => $data) {
$fields[$field] = $data;
}
unset($fields["uri-date"]);
// Update check for this field has to be done differently
- $datefields = array("name-date", "uri-date");
- foreach ($datefields AS $field) {
+ $datefields = ["name-date", "uri-date"];
+ foreach ($datefields as $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);
$update = true;
}
}
- foreach ($fields AS $field => $data) {
+ foreach ($fields as $field => $data) {
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);
$update = true;
);
}
- update_contact_avatar(
+ Contact::updateAvatar(
$author["avatar"],
$importer["uid"],
$contact["id"],
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
- $gcid = GlobalContact::update($poco);
+ $gcid = GContact::update($poco);
- GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
+ GContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);
*
* @param object $xpath XPath object
* @param object $activity Activity object
- * @param text $element element name
+ * @param string $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 transformActivity($xpath, $activity, $element)
{
if (!is_object($activity)) {
return "";
$obj_element = $obj_doc->createElementNS(NAMESPACE_ATOM1, $element);
$activity_type = $xpath->query("activity:object-type/text()", $activity)->item(0)->nodeValue;
- XML::add_element($obj_doc, $obj_element, "type", $activity_type);
+ XML::addElement($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0);
if (is_object($id)) {
* @param object $xpath XPath object
* @param object $mail mail elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @return void
* @todo Find good type-hints for all parameter
*/
- private static function process_mail($xpath, $mail, $importer)
+ private static function processMail($xpath, $mail, $importer)
{
logger("Processing mails");
/// @TODO Rewrite this to one statement
- $msg = array();
+ $msg = [];
$msg["uid"] = $importer["importer_uid"];
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
$msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue;
// send notifications.
/// @TODO Arange this mess
- $notif_params = array(
+ $notif_params = [
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
"source_photo" => $importer["thumb"],
"verb" => ACTIVITY_POST,
"otype" => "mail"
- );
+ ];
notification($notif_params);
* @param object $xpath XPath object
* @param object $suggestion suggestion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @return boolean
* @todo Find good type-hints for all parameter
*/
- private static function process_suggestion($xpath, $suggestion, $importer)
+ private static function processSuggestion($xpath, $suggestion, $importer)
{
$a = get_app();
logger("Processing suggestions");
/// @TODO Rewrite this to one statement
- $suggest = array();
+ $suggest = [];
$suggest["uid"] = $importer["importer_uid"];
$suggest["cid"] = $importer["id"];
$suggest["url"] = $xpath->query("dfrn:url/text()", $suggestion)->item(0)->nodeValue;
intval($suggest["cid"]),
dbesc($suggest["body"]),
dbesc($hash),
- dbesc(datetime_convert()),
+ dbesc(DateTimeFormat::utcNow()),
intval(0)
);
- notification(array(
- "type" => NOTIFY_SUGGEST,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["importer_uid"],
- "item" => $suggest,
- "link" => System::baseUrl()."/notifications/intros",
- "source_name" => $importer["name"],
- "source_link" => $importer["url"],
- "source_photo" => $importer["photo"],
- "verb" => ACTIVITY_REQ_FRIEND,
- "otype" => "intro")
+ notification(
+ [
+ "type" => NOTIFY_SUGGEST,
+ "notify_flags" => $importer["notify-flags"],
+ "language" => $importer["language"],
+ "to_name" => $importer["username"],
+ "to_email" => $importer["email"],
+ "uid" => $importer["importer_uid"],
+ "item" => $suggest,
+ "link" => System::baseUrl()."/notifications/intros",
+ "source_name" => $importer["name"],
+ "source_link" => $importer["url"],
+ "source_photo" => $importer["photo"],
+ "verb" => ACTIVITY_REQ_FRIEND,
+ "otype" => "intro"]
);
return true;
* @param object $xpath XPath object
* @param object $relocation relocation elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @return boolean
* @todo Find good type-hints for all parameter
*/
- private static function process_relocation($xpath, $relocation, $importer)
+ private static function processRelocation($xpath, $relocation, $importer)
{
logger("Processing relocations");
/// @TODO Rewrite this to one statement
- $relocate = array();
+ $relocate = [];
$relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"];
$relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
dbesc(normalise_link($old["url"]))
);
- update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
+ Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false) {
return false;
// update items
/// @todo This is an extreme performance killer
- $fields = array(
- 'owner-link' => array($old["url"], $relocate["url"]),
- 'author-link' => array($old["url"], $relocate["url"]),
+ $fields = [
+ 'owner-link' => [$old["url"], $relocate["url"]],
+ 'author-link' => [$old["url"], $relocate["url"]],
//'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",
* @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?
+ * @return mixed
* @todo set proper type-hints (array?)
*/
- private static function update_content($current, $item, $importer, $entrytype)
+ private static function updateContent($current, $item, $importer, $entrytype)
{
$changed = false;
- if (edited_timestamp_is_newer($current, $item)) {
+ if (self::isEditedTimestampNewer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have.
- if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
+ if (DateTimeFormat::utc($item["edited"]) < $current["edited"]) {
return false;
}
- $fields = array('title' => $item["title"], 'body' => $item["body"],
- 'tag' => $item["tag"], 'changed' => datetime_convert(),
- 'edited' => datetime_convert("UTC", "UTC", $item["edited"]));
-
- $condition = array("`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]);
- dba::update('item', $fields, $condition);
+ $fields = ['title' => $item["title"], 'body' => $item["body"],
+ 'tag' => $item["tag"], 'changed' => DateTimeFormat::utcNow(),
+ 'edited' => DateTimeFormat::utc($item["edited"])];
- create_tags_from_itemuri($item["uri"], $importer["importer_uid"]);
- update_thread_uri($item["uri"], $importer["importer_uid"]);
+ $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
+ Item::update($fields, $condition);
$changed = true;
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)",
- 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)",
- intval($item["last-child"]),
- dbesc(datetime_convert()),
- dbesc($item["uri"]),
- intval($importer["importer_uid"])
- );
- }
return $changed;
}
* @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 getEntryType($importer, $item)
{
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
* valid community action. Also forum_mode makes it valid for sure.
* If neither, it's not.
*/
-
- /// @TODO Maybe merge these if() blocks into one?
if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
$is_a_remote_action = false;
logger("not a community action");
* @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
+ * @return void
* @todo set proper type-hints (array?)
*/
- private static function do_poke($item, $importer, $posted_id)
+ private static function doPoke($item, $importer, $posted_id)
{
$verb = urldecode(substr($item["verb"], strpos($item["verb"], "#")+1));
if (!$verb) {
return;
}
- $xo = parse_xml_string($item["object"], false);
+ $xo = XML::parseString($item["object"], false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
// send a notification
notification(
- array(
+ [
"type" => NOTIFY_POKE,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
"to_email" => $importer["email"],
"uid" => $importer["importer_uid"],
"item" => $item,
- "link" => System::baseUrl()."/display/".urlencode(get_item_guid($posted_id)),
+ "link" => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
"source_name" => stripslashes($item["author-name"]),
"source_link" => $item["author-link"],
- "source_photo" => ((link_compare($item["author-link"],$importer["url"]))
+ "source_photo" => ((link_compare($item["author-link"], $importer["url"]))
? $importer["thumb"] : $item["author-avatar"]),
"verb" => $item["verb"],
"otype" => "person",
"activity" => $verb,
- "parent" => $item["parent"])
+ "parent" => $item["parent"]]
);
}
}
* @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 processVerbs($entrytype, $importer, &$item, &$is_like)
{
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
// This function once was responsible for DFRN and OStatus.
if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
logger("New follower");
- new_follower($importer, $contact, $item, $nickname);
+ Contact::addRelationship($importer, $contact, $item, $nickname);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
logger("Lost follower");
- lose_follower($importer, $contact, $item);
+ Contact::removeFollower($importer, $contact, $item);
return false;
}
if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
logger("New friend request");
- new_follower($importer, $contact, $item, $nickname, true);
+ Contact::addRelationship($importer, $contact, $item, $nickname, true);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
logger("Lost sharer");
- lose_sharer($importer, $contact, $item);
+ Contact::removeSharer($importer, $contact, $item);
return false;
}
} else {
}
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 = XML::parseString($item["object"], false);
+ $xt = XML::parseString($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q(
// extract tag, if not duplicate, add to parent item
if ($xo->content) {
- if (!(stristr($r[0]["tag"],trim($xo->content)))) {
- q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
- intval($r[0]["id"])
- );
- create_tags_from_item($r[0]["id"]);
+ if (!stristr($r[0]["tag"], trim($xo->content))) {
+ $tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+ Item::update(['tag' => $tag], ['id' => $r[0]["id"]]);
}
}
}
*
* @param object $links link elements
* @param array $item the item record
+ * @return void
* @todo set proper type-hints
*/
- private static function parse_links($links, &$item)
+ private static function parseLinks($links, &$item)
{
$rel = "";
$href = "";
$type = "";
$length = "0";
$title = "";
- foreach ($links AS $link) {
- foreach ($link->attributes AS $attributes) {
- /// @TODO Rewrite these repeated (same) if () statements to a switch()
- if ($attributes->name == "href") {
- $href = $attributes->textContent;
- }
- if ($attributes->name == "rel") {
- $rel = $attributes->textContent;
- }
- if ($attributes->name == "type") {
- $type = $attributes->textContent;
- }
- if ($attributes->name == "length") {
- $length = $attributes->textContent;
- }
- if ($attributes->name == "title") {
- $title = $attributes->textContent;
+ foreach ($links as $link) {
+ foreach ($link->attributes as $attributes) {
+ switch ($attributes->name) {
+ case "href" : $href = $attributes->textContent; break;
+ case "rel" : $rel = $attributes->textContent; break;
+ case "type" : $type = $attributes->textContent; break;
+ case "length": $length = $attributes->textContent; break;
+ case "title" : $title = $attributes->textContent; break;
}
}
if (($rel != "") && ($href != "")) {
/**
* @brief Processes the entry elements which contain the items and comments
*
- * @param array $header Array of the header elements that always stay the same
- * @param object $xpath XPath object
- * @param object $entry entry elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $header Array of the header elements that always stay the same
+ * @param object $xpath XPath object
+ * @param object $entry entry elements
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @param object $xml xml
+ * @return void
* @todo Add type-hints
*/
- private static function process_entry($header, $xpath, $entry, $importer, $xml)
+ private static function processEntry($header, $xpath, $entry, $importer, $xml)
{
logger("Processing entries");
$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",
+ "SELECT `id`, `uid`, `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"])
- ) {
- logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ if (DBM::is_result($current) && !self::isEditedTimestampNewer($current[0], $item)) {
+ logger("Item ".$item["uri"]." already existed in this version.", LOGGER_DEBUG);
return;
}
$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([' ',"\t","\r","\n"], ['','','',''], $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"]);
+ $item["body"] = BBCode::limitBodySize($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)) {
+ $base_url = get_app()->get_baseurl();
$item['body'] = reltoabs($item['body'], $base_url);
$item['body'] = html2bb_video($item['body']);
- $item['body'] = oembed_html2bbcode($item['body']);
+ $item['body'] = OEmbed::HTML2BBCode($item['body']);
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
// We don't need the content element since "dfrn:env" is always present
//$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
- $item["last-child"] = $xpath->query("dfrn:comment-allow/text()", $entry)->item(0)->nodeValue;
$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
$georsspoint = $xpath->query("georss:point", $entry);
$notice_info = $xpath->query("statusnet:notice_info", $entry);
if ($notice_info && ($notice_info->length > 0)) {
- foreach ($notice_info->item(0)->attributes AS $attributes) {
+ foreach ($notice_info->item(0)->attributes as $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
$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::insert"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
}
$object = $xpath->query("activity:object", $entry)->item(0);
- $item["object"] = self::transform_activity($xpath, $object, "object");
+ $item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
- $r = parse_xml_string($item["object"], false);
+ $r = XML::parseString($item["object"], false);
if (isset($r->type)) {
$item["object-type"] = $r->type;
}
}
$target = $xpath->query("activity:target", $entry)->item(0);
- $item["target"] = self::transform_activity($xpath, $target, "target");
+ $item["target"] = self::transformActivity($xpath, $target, "target");
$categories = $xpath->query("atom:category", $entry);
if ($categories) {
- foreach ($categories AS $category) {
+ foreach ($categories as $category) {
$term = "";
$scheme = "";
- foreach ($category->attributes AS $attributes) {
+ foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
}
$links = $xpath->query("atom:link", $entry);
if ($links) {
- self::parse_links($links, $item);
+ self::parseLinks($links, $item);
}
$item['conversation-uri'] = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
- foreach ($conv->item(0)->attributes AS $attributes) {
+ foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item['conversation-uri'] = $attributes->textContent;
}
$inreplyto = $xpath->query("thr:in-reply-to", $entry);
if (is_object($inreplyto->item(0))) {
- foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
}
// Get the type of the item (Top level post, reply or remote reply)
- $entrytype = self::get_entry_type($importer, $item);
+ $entrytype = self::getEntryType($importer, $item);
// 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, [DFRN_REPLY, DFRN_REPLY_RC])) {
if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_COMMENT;
}
if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
$item["network"] = $author["network"];
}
-
- /// @TODO maybe remove this old-lost code then?
- // This code was taken from the old DFRN code
- // When activated, forums don't work.
- // And: Why should we disallow commenting by followers?
- // the behaviour is now similar to the Diaspora part.
- //if ($importer["rel"] == CONTACT_IS_FOLLOWER) {
- // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
- // return;
- //}
}
if ($entrytype == DFRN_REPLY_RC) {
$ev = bbtoevent($item["body"]);
if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
- /// @TODO Mixure of "/' ahead ...
- $ev["cid"] = $importer["id"];
- $ev["uid"] = $importer["uid"];
- $ev["uri"] = $item["uri"];
- $ev["edited"] = $item["edited"];
- $ev['private'] = $item['private'];
- $ev["guid"] = $item["guid"];
+ $ev["cid"] = $importer["id"];
+ $ev["uid"] = $importer["uid"];
+ $ev["uri"] = $item["uri"];
+ $ev["edited"] = $item["edited"];
+ $ev["private"] = $item["private"];
+ $ev["guid"] = $item["guid"];
$r = q(
"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
}
}
- if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
- logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
+ if (!self::processVerbs($entrytype, $importer, $item, $is_like)) {
+ logger("Exiting because 'processVerbs' told us so", LOGGER_DEBUG);
return;
}
// Update content if 'updated' changes
if (DBM::is_result($current)) {
- if (self::update_content($r[0], $item, $importer, $entrytype)) {
+ if (self::updateContent($r[0], $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
} else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
return;
}
- if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
- $posted_id = item_store($item);
+ if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
+ $posted_id = Item::insert($item);
$parent = 0;
if ($posted_id) {
$parent_uri = $r[0]["parent-uri"];
}
- if (!$is_like) {
- $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",
- dbesc(datetime_convert()),
- intval($importer["importer_uid"]),
- intval($posted_id)
- );
- }
-
if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $posted_id);
/*
* 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.
- * the tgroup delivery code called from item_store will correct it if it's a forum,
+ * the tgroup delivery code called from Item::insert will correct it if it's a forum,
* but we're going to unconditionally correct it here so that the post will always be owned by our contact.
*/
logger('Correcting item owner.', LOGGER_DEBUG);
$item["owner-avatar"] = $importer["thumb"];
}
- if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+ if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return;
}
// This is my contact on another system, but it's really me.
// Turn this into a wall post.
- $notify = item_is_remote_self($importer, $item);
+ $notify = Item::isRemoteSelf($importer, $item);
- $posted_id = item_store($item, false, $notify);
+ $posted_id = Item::insert($item, false, $notify);
logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
- if (stristr($item["verb"],ACTIVITY_POKE))
- self::do_poke($item, $importer, $posted_id);
+ if (stristr($item["verb"], ACTIVITY_POKE)) {
+ self::doPoke($item, $importer, $posted_id);
+ }
}
}
* @param object $xpath XPath object
* @param object $deletion deletion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @return void
* @todo set proper type-hints
*/
- private static function process_deletion($xpath, $deletion, $importer)
+ private static function processDeletion($xpath, $deletion, $importer)
{
logger("Processing deletions");
- foreach ($deletion->attributes AS $attributes) {
+ foreach ($deletion->attributes as $attributes) {
if ($attributes->name == "ref") {
$uri = $attributes->textContent;
}
- if ($attributes->name == "when") {
- $when = $attributes->textContent;
- }
- }
- if ($when) {
- $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
- } else {
- $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
}
if (!$uri || !$importer["id"]) {
return false;
}
- /// @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"])
- );
- if (!DBM::is_result($r)) {
+ $condition = ["`uri` = ? AND `uid` = ? AND `contact-id` = ? AND NOT `file` LIKE '%[%'",
+ $uri, $importer["uid"], $importer["id"]];
+ $item = dba::selectFirst('item', ['id'], $condition);
+ if (!DBM::is_result($item)) {
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);
-
- if (!$item["deleted"]) {
- logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
- } else {
- return;
- }
-
- if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
- logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
- event_delete($item["event-id"]);
- }
-
- 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);
-
- if ($xt->type == ACTIVITY_OBJ_NOTE) {
- $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);
- $author_remove = (($item["origin"] && $item["self"]) ? true : false);
- $author_copy = (($item["origin"]) ? true : false);
+ $entrytype = self::getEntryType($importer, $item);
- if ($owner_remove && $author_copy) {
- return;
- }
- if ($author_remove || $owner_remove) {
- $tags = explode(',', $i[0]["tag"]);
- $newtags = array();
- if (count($tags)) {
- foreach ($tags as $tag) {
- if (trim($tag) !== trim($xo->body)) {
- $newtags[] = trim($tag);
- }
- }
- }
- q(
- "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc(implode(',', $newtags)),
- intval($i[0]["id"])
- );
- create_tags_from_item($i[0]["id"]);
- }
- }
- }
- }
+ if (!$item["deleted"]) {
+ logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
+ } else {
+ return;
+ }
- if ($entrytype == DFRN_TOP_LEVEL) {
- $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"])
- );
- 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',
- `body` = '', `title` = ''
- WHERE `uri` = '%s' AND `uid` IN (0, %d)",
- 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)",
- 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
- ORDER BY `created` DESC LIMIT 1",
- dbesc($item["parent-uri"]),
- intval($importer["uid"])
- );
- if (DBM::is_result($r)) {
- q(
- "UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
- intval($r[0]["id"])
- );
- }
- }
- // if this is a relayed delete, propagate it to other recipients
+ Item::deleteById($item["id"]);
- if ($entrytype == DFRN_REPLY_RC) {
- logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
- }
+ if ($entrytype != DFRN_TOP_LEVEL) {
+ // if this is a relayed delete, propagate it to other recipients
+ if ($entrytype == DFRN_REPLY_RC) {
+ logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
}
}
}
/**
* @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 string $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
*/
$doc = new DOMDocument();
@$doc->loadXML($xml);
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$xpath->registerNamespace("atom", NAMESPACE_ATOM1);
$xpath->registerNamespace("thr", NAMESPACE_THREAD);
$xpath->registerNamespace("at", NAMESPACE_TOMB);
$xpath->registerNamespace("ostatus", NAMESPACE_OSTATUS);
$xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET);
- $header = array();
+ $header = [];
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_DFRN;
$header["type"] = "remote";
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
- $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
+ $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
if ($accounttype != $importer["contact-type"]) {
- dba::update('contact', array('contact-type' => $accounttype), array('id' => $importer["id"]));
+ dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
}
}
// is it a public forum? Private forums aren't supported with this method
// This is deprecated since 3.5.1
- $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
+ $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
if ($forum != $importer["forum"]) {
- $condition = array('`forum` != ? AND `id` = ?', $forum, $importer["id"]);
- dba::update('contact', array('forum' => $forum), $condition);
+ $condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
+ dba::update('contact', ['forum' => $forum], $condition);
}
// We are processing relocations even if we are ignoring a contact
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
- foreach ($relocations AS $relocation) {
- self::process_relocation($xpath, $relocation, $importer);
+ foreach ($relocations as $relocation) {
+ self::processRelocation($xpath, $relocation, $importer);
}
if ($importer["readonly"]) {
}
$mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails AS $mail) {
- self::process_mail($xpath, $mail, $importer);
+ foreach ($mails as $mail) {
+ self::processMail($xpath, $mail, $importer);
}
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions AS $suggestion) {
- self::process_suggestion($xpath, $suggestion, $importer);
+ foreach ($suggestions as $suggestion) {
+ self::processSuggestion($xpath, $suggestion, $importer);
}
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
- foreach ($deletions AS $deletion) {
- self::process_deletion($xpath, $deletion, $importer);
+ foreach ($deletions as $deletion) {
+ self::processDeletion($xpath, $deletion, $importer);
}
if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry) {
- self::process_entry($header, $xpath, $entry, $importer, $xml);
+ foreach ($entries as $entry) {
+ self::processEntry($header, $xpath, $entry, $importer, $xml);
}
} else {
- $newentries = array();
+ $newentries = [];
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
$created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
$newentries[strtotime($created)] = $entry;
}
// Now sort after the publishing date
ksort($newentries);
- foreach ($newentries AS $entry) {
- self::process_entry($header, $xpath, $entry, $importer, $xml);
+ foreach ($newentries as $entry) {
+ self::processEntry($header, $xpath, $entry, $importer, $xml);
}
}
logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
return 200;
}
+
+ /**
+ * @param App $a App
+ * @param string $contact_nick contact nickname
+ */
+ public static function autoRedir(App $a, $contact_nick)
+ {
+ // prevent looping
+ if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
+ return;
+ }
+
+ if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) {
+ return;
+ }
+
+ if (local_user()) {
+ // We need to find out if $contact_nick is a user on this hub, and if so, if I
+ // am a contact of that user. However, that user may have other contacts with the
+ // same nickname as me on other hubs or other networks. Exclude these by requiring
+ // that the contact have a local URL. I will be the only person with my nickname at
+ // this URL, so if a result is found, then I am a contact of the $contact_nick user.
+ //
+ // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
+
+ $baseurl = System::baseUrl();
+ $domain_st = strpos($baseurl, "://");
+ if ($domain_st === false) {
+ return;
+ }
+ $baseurl = substr($baseurl, $domain_st + 3);
+ $nurl = normalise_link($baseurl);
+
+ /// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
+ AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
+ dbesc($contact_nick),
+ dbesc($a->user['nickname']),
+ dbesc($baseurl),
+ dbesc($nurl)
+ );
+ if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
+ return;
+ }
+
+ $r = q("SELECT * FROM contact WHERE nick = '%s'
+ AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1",
+ dbesc($contact_nick),
+ dbesc(NETWORK_DFRN),
+ intval(local_user()),
+ dbesc($baseurl)
+ );
+ if (! DBM::is_result($r)) {
+ return;
+ }
+
+ $cid = $r[0]['id'];
+
+ $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+ if ($r[0]['duplex'] && $r[0]['issued-id']) {
+ $orig_id = $r[0]['issued-id'];
+ $dfrn_id = '1:' . $orig_id;
+ }
+ if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
+ $orig_id = $r[0]['dfrn-id'];
+ $dfrn_id = '0:' . $orig_id;
+ }
+
+ // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
+ // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
+
+ if (strlen($dfrn_id) < 3) {
+ return;
+ }
+
+ $sec = random_string();
+
+ dba::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
+
+ $url = curPageURL();
+
+ logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+ $dest = (($url) ? '&destination_url=' . $url : '');
+ goaway($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
+ }
+
+ return;
+ }
+
+ /**
+ * @brief Returns the activity verb
+ *
+ * @param array $item Item array
+ *
+ * @return string activity verb
+ */
+ private static function constructVerb(array $item)
+ {
+ if ($item['verb']) {
+ return $item['verb'];
+ }
+ return ACTIVITY_POST;
+ }
+
+ private static function tgroupCheck($uid, $item)
+ {
+ $mention = false;
+
+ // check that the message originated elsewhere and is a top-level post
+
+ if ($item['wall'] || $item['origin'] || ($item['uri'] != $item['parent-uri'])) {
+ return false;
+ }
+
+ $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($uid)
+ );
+ if (!DBM::is_result($u)) {
+ return false;
+ }
+
+ $community_page = ($u[0]['page-flags'] == PAGE_COMMUNITY);
+ $prvgroup = ($u[0]['page-flags'] == PAGE_PRVGROUP);
+
+ $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+
+ /*
+ * Diaspora uses their own hardwired link URL in @-tags
+ * instead of the one we supply with webfinger
+ */
+ $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+
+ $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
+ if ($cnt) {
+ foreach ($matches as $mtch) {
+ if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
+ $mention = true;
+ logger('mention found: ' . $mtch[2]);
+ }
+ }
+ }
+
+ if (!$mention) {
+ return false;
+ }
+
+ return $community_page || $prvgroup;
+ }
+
+ /**
+ * This function returns true if $update has an edited timestamp newer
+ * than $existing, i.e. $update contains new data which should override
+ * what's already there. If there is no timestamp yet, the update is
+ * assumed to be newer. If the update has no timestamp, the existing
+ * item is assumed to be up-to-date. If the timestamps are equal it
+ * assumes the update has been seen before and should be ignored.
+ *
+ */
+ private static function isEditedTimestampNewer($existing, $update)
+ {
+ if (!x($existing, 'edited') || !$existing['edited']) {
+ return true;
+ }
+ if (!x($update, 'edited') || !$update['edited']) {
+ return false;
+ }
+
+ $existing_edited = DateTimeFormat::utc($existing['edited']);
+ $update_edited = DateTimeFormat::utc($update['edited']);
+
+ return (strcmp($existing_edited, $update_edited) < 0);
+ }
}
projects / friendica.git / blobdiff