}
return ['message' => (string)base64url_decode($base->data),
- 'author' => unxmlify($author_addr),
+ 'author' => XML::unxmlify($author_addr),
'key' => (string)$key];
}
Logger::log('Message verified.');
return ['message' => (string)$inner_decrypted,
- 'author' => unxmlify($author_link),
+ 'author' => XML::unxmlify($author_link),
'key' => (string)$key];
}
*/
private static function receiveAccountMigration(array $importer, $data)
{
- $old_handle = notags(unxmlify($data->author));
- $new_handle = notags(unxmlify($data->profile->author));
- $signature = notags(unxmlify($data->signature));
+ $old_handle = notags(XML::unxmlify($data->author));
+ $new_handle = notags(XML::unxmlify($data->profile->author));
+ $signature = notags(XML::unxmlify($data->signature));
$contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) {
*/
private static function receiveAccountDeletion($data)
{
- $author = notags(unxmlify($data->author));
+ $author = notags(XML::unxmlify($data->author));
$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
while ($contact = DBA::fetch($contacts)) {
*/
private static function receiveComment(array $importer, $sender, $data, $xml)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $parent_guid = notags(unxmlify($data->parent_guid));
- $text = unxmlify($data->text);
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $parent_guid = notags(XML::unxmlify($data->parent_guid));
+ $text = XML::unxmlify($data->text);
if (isset($data->created_at)) {
- $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
+ $created_at = DateTimeFormat::utc(notags(XML::unxmlify($data->created_at)));
} else {
$created_at = DateTimeFormat::utcNow();
}
if (isset($data->thread_parent_guid)) {
- $thread_parent_guid = notags(unxmlify($data->thread_parent_guid));
+ $thread_parent_guid = notags(XML::unxmlify($data->thread_parent_guid));
$thr_uri = self::getUriFromGuid("", $thread_parent_guid, true);
} else {
$thr_uri = "";
*/
private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $subject = notags(unxmlify($data->subject));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $subject = notags(XML::unxmlify($data->subject));
// "diaspora_handle" is the element name from the old version
// "author" is the element name from the new version
if ($mesg->author) {
- $msg_author = notags(unxmlify($mesg->author));
+ $msg_author = notags(XML::unxmlify($mesg->author));
} elseif ($mesg->diaspora_handle) {
- $msg_author = notags(unxmlify($mesg->diaspora_handle));
+ $msg_author = notags(XML::unxmlify($mesg->diaspora_handle));
} else {
return false;
}
- $msg_guid = notags(unxmlify($mesg->guid));
- $msg_conversation_guid = notags(unxmlify($mesg->conversation_guid));
- $msg_text = unxmlify($mesg->text);
- $msg_created_at = DateTimeFormat::utc(notags(unxmlify($mesg->created_at)));
+ $msg_guid = notags(XML::unxmlify($mesg->guid));
+ $msg_conversation_guid = notags(XML::unxmlify($mesg->conversation_guid));
+ $msg_text = XML::unxmlify($mesg->text);
+ $msg_created_at = DateTimeFormat::utc(notags(XML::unxmlify($mesg->created_at)));
if ($msg_conversation_guid != $guid) {
Logger::log("message conversation guid does not belong to the current conversation.");
*/
private static function receiveConversation(array $importer, $msg, $data)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $subject = notags(unxmlify($data->subject));
- $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
- $participants = notags(unxmlify($data->participants));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $subject = notags(XML::unxmlify($data->subject));
+ $created_at = DateTimeFormat::utc(notags(XML::unxmlify($data->created_at)));
+ $participants = notags(XML::unxmlify($data->participants));
$messages = $data->message;
*/
private static function receiveLike(array $importer, $sender, $data)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $parent_guid = notags(unxmlify($data->parent_guid));
- $parent_type = notags(unxmlify($data->parent_type));
- $positive = notags(unxmlify($data->positive));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $parent_guid = notags(XML::unxmlify($data->parent_guid));
+ $parent_type = notags(XML::unxmlify($data->parent_type));
+ $positive = notags(XML::unxmlify($data->positive));
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
*/
private static function receiveMessage(array $importer, $data)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $conversation_guid = notags(unxmlify($data->conversation_guid));
- $text = unxmlify($data->text);
- $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $conversation_guid = notags(XML::unxmlify($data->conversation_guid));
+ $text = XML::unxmlify($data->text);
+ $created_at = DateTimeFormat::utc(notags(XML::unxmlify($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
*/
private static function receiveParticipation(array $importer, $data)
{
- $author = strtolower(notags(unxmlify($data->author)));
- $parent_guid = notags(unxmlify($data->parent_guid));
+ $author = strtolower(notags(XML::unxmlify($data->author)));
+ $parent_guid = notags(XML::unxmlify($data->parent_guid));
$contact_id = Contact::getIdForURL($author);
if (!$contact_id) {
*/
private static function receiveProfile(array $importer, $data)
{
- $author = strtolower(notags(unxmlify($data->author)));
+ $author = strtolower(notags(XML::unxmlify($data->author)));
$contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) {
return false;
}
- $name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
- $image_url = unxmlify($data->image_url);
- $birthday = unxmlify($data->birthday);
- $gender = unxmlify($data->gender);
- $about = Markdown::toBBCode(unxmlify($data->bio));
- $location = Markdown::toBBCode(unxmlify($data->location));
- $searchable = (unxmlify($data->searchable) == "true");
- $nsfw = (unxmlify($data->nsfw) == "true");
- $tags = unxmlify($data->tag_string);
+ $name = XML::unxmlify($data->first_name).((strlen($data->last_name)) ? " ".XML::unxmlify($data->last_name) : "");
+ $image_url = XML::unxmlify($data->image_url);
+ $birthday = XML::unxmlify($data->birthday);
+ $gender = XML::unxmlify($data->gender);
+ $about = Markdown::toBBCode(XML::unxmlify($data->bio));
+ $location = Markdown::toBBCode(XML::unxmlify($data->location));
+ $searchable = (XML::unxmlify($data->searchable) == "true");
+ $nsfw = (XML::unxmlify($data->nsfw) == "true");
+ $tags = XML::unxmlify($data->tag_string);
$tags = explode("#", $tags);
*/
private static function receiveContactRequest(array $importer, $data)
{
- $author = unxmlify($data->author);
- $recipient = unxmlify($data->recipient);
+ $author = XML::unxmlify($data->author);
+ $recipient = XML::unxmlify($data->recipient);
if (!$author || !$recipient) {
return false;
// the current protocol version doesn't know these fields
// That means that we will assume their existance
if (isset($data->following)) {
- $following = (unxmlify($data->following) == "true");
+ $following = (XML::unxmlify($data->following) == "true");
} else {
$following = true;
}
if (isset($data->sharing)) {
- $sharing = (unxmlify($data->sharing) == "true");
+ $sharing = (XML::unxmlify($data->sharing) == "true");
} else {
$sharing = true;
}
*/
private static function receiveReshare(array $importer, $data, $xml)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
- $root_author = notags(unxmlify($data->root_author));
- $root_guid = notags(unxmlify($data->root_guid));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $created_at = DateTimeFormat::utc(notags(XML::unxmlify($data->created_at)));
+ $root_author = notags(XML::unxmlify($data->root_author));
+ $root_guid = notags(XML::unxmlify($data->root_guid));
/// @todo handle unprocessed property "provider_display_name"
- $public = notags(unxmlify($data->public));
+ $public = notags(XML::unxmlify($data->public));
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
*/
private static function itemRetraction(array $importer, array $contact, $data)
{
- $author = notags(unxmlify($data->author));
- $target_guid = notags(unxmlify($data->target_guid));
- $target_type = notags(unxmlify($data->target_type));
+ $author = notags(XML::unxmlify($data->author));
+ $target_guid = notags(XML::unxmlify($data->target_guid));
+ $target_type = notags(XML::unxmlify($data->target_type));
$person = self::personByHandle($author);
if (!is_array($person)) {
*/
private static function receiveRetraction(array $importer, $sender, $data)
{
- $target_type = notags(unxmlify($data->target_type));
+ $target_type = notags(XML::unxmlify($data->target_type));
$contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
*/
private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{
- $author = notags(unxmlify($data->author));
- $guid = notags(unxmlify($data->guid));
- $created_at = DateTimeFormat::utc(notags(unxmlify($data->created_at)));
- $public = notags(unxmlify($data->public));
- $text = unxmlify($data->text);
- $provider_display_name = notags(unxmlify($data->provider_display_name));
+ $author = notags(XML::unxmlify($data->author));
+ $guid = notags(XML::unxmlify($data->guid));
+ $created_at = DateTimeFormat::utc(notags(XML::unxmlify($data->created_at)));
+ $public = notags(XML::unxmlify($data->public));
+ $text = XML::unxmlify($data->text);
+ $provider_display_name = notags(XML::unxmlify($data->provider_display_name));
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
$address = [];
if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) {
- $address[$fieldname] = notags(unxmlify($data));
+ $address[$fieldname] = notags(XML::unxmlify($data));
}
}
// Attach embedded pictures to the body
if ($data->photo) {
foreach ($data->photo as $photo) {
- $body = "[img]".unxmlify($photo->remote_photo_path).
- unxmlify($photo->remote_photo_name)."[/img]\n".$body;
+ $body = "[img]".XML::unxmlify($photo->remote_photo_path).
+ XML::unxmlify($photo->remote_photo_name)."[/img]\n".$body;
}
$datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
projects / friendica.git / blobdiff