Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 17:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

notags calls

Browse source 
implement removeTags function
This commit is contained in:
Adam Magness 2018-11-08 10:14:37 -05:00
parent 991f259ecb
commit a0f65ca7a1
51 changed files with 274 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/DFRN.php
View file

@ -2494,7 +2494,7 @@ class DFRN
$item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
$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"] = Strings::removeTags(base64url_decode($item["body"]));
$item["body"] = BBCode::limitBodySize($item["body"]);

100
src/Protocol/Diaspora.php
View file

@ -1506,9 +1506,9 @@ class Diaspora
*/
private static function receiveAccountMigration(array $importer, $data)
{
$old_handle = notags(XML::unescape($data->author));
$new_handle = notags(XML::unescape($data->profile->author));
$signature = notags(XML::unescape($data->signature));
$old_handle = Strings::removeTags(XML::unescape($data->author));
$new_handle = Strings::removeTags(XML::unescape($data->profile->author));
$signature = Strings::removeTags(XML::unescape($data->signature));
$contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) {
@ -1566,7 +1566,7 @@ class Diaspora
*/
private static function receiveAccountDeletion($data)
{
$author = notags(XML::unescape($data->author));
$author = Strings::removeTags(XML::unescape($data->author));
$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
while ($contact = DBA::fetch($contacts)) {
@ -1657,19 +1657,19 @@ class Diaspora
*/
private static function receiveComment(array $importer, $sender, $data, $xml)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$parent_guid = notags(XML::unescape($data->parent_guid));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$parent_guid = Strings::removeTags(XML::unescape($data->parent_guid));
$text = XML::unescape($data->text);
if (isset($data->created_at)) {
$created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($data->created_at)));
} else {
$created_at = DateTimeFormat::utcNow();
}
if (isset($data->thread_parent_guid)) {
$thread_parent_guid = notags(XML::unescape($data->thread_parent_guid));
$thread_parent_guid = Strings::removeTags(XML::unescape($data->thread_parent_guid));
$thr_uri = self::getUriFromGuid("", $thread_parent_guid, true);
} else {
$thr_uri = "";
@ -1774,24 +1774,24 @@ class Diaspora
*/
private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$subject = notags(XML::unescape($data->subject));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$subject = Strings::removeTags(XML::unescape($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(XML::unescape($mesg->author));
$msg_author = Strings::removeTags(XML::unescape($mesg->author));
} elseif ($mesg->diaspora_handle) {
$msg_author = notags(XML::unescape($mesg->diaspora_handle));
$msg_author = Strings::removeTags(XML::unescape($mesg->diaspora_handle));
} else {
return false;
}
$msg_guid = notags(XML::unescape($mesg->guid));
$msg_conversation_guid = notags(XML::unescape($mesg->conversation_guid));
$msg_guid = Strings::removeTags(XML::unescape($mesg->guid));
$msg_conversation_guid = Strings::removeTags(XML::unescape($mesg->conversation_guid));
$msg_text = XML::unescape($mesg->text);
$msg_created_at = DateTimeFormat::utc(notags(XML::unescape($mesg->created_at)));
$msg_created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($mesg->created_at)));
if ($msg_conversation_guid != $guid) {
Logger::log("message conversation guid does not belong to the current conversation.");
@ -1862,11 +1862,11 @@ class Diaspora
*/
private static function receiveConversation(array $importer, $msg, $data)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$subject = notags(XML::unescape($data->subject));
$created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$participants = notags(XML::unescape($data->participants));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$subject = Strings::removeTags(XML::unescape($data->subject));
$created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($data->created_at)));
$participants = Strings::removeTags(XML::unescape($data->participants));
$messages = $data->message;
@ -1920,11 +1920,11 @@ class Diaspora
*/
private static function receiveLike(array $importer, $sender, $data)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$parent_guid = notags(XML::unescape($data->parent_guid));
$parent_type = notags(XML::unescape($data->parent_type));
$positive = notags(XML::unescape($data->positive));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$parent_guid = Strings::removeTags(XML::unescape($data->parent_guid));
$parent_type = Strings::removeTags(XML::unescape($data->parent_type));
$positive = Strings::removeTags(XML::unescape($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.
@ -2029,11 +2029,11 @@ class Diaspora
*/
private static function receiveMessage(array $importer, $data)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$conversation_guid = notags(XML::unescape($data->conversation_guid));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$conversation_guid = Strings::removeTags(XML::unescape($data->conversation_guid));
$text = XML::unescape($data->text);
$created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
@ -2104,8 +2104,8 @@ class Diaspora
*/
private static function receiveParticipation(array $importer, $data)
{
$author = strtolower(notags(XML::unescape($data->author)));
$parent_guid = notags(XML::unescape($data->parent_guid));
$author = strtolower(Strings::removeTags(XML::unescape($data->author)));
$parent_guid = Strings::removeTags(XML::unescape($data->parent_guid));
$contact_id = Contact::getIdForURL($author);
if (!$contact_id) {
@ -2197,7 +2197,7 @@ class Diaspora
*/
private static function receiveProfile(array $importer, $data)
{
$author = strtolower(notags(XML::unescape($data->author)));
$author = strtolower(Strings::removeTags(XML::unescape($data->author)));
$contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) {
@ -2574,13 +2574,13 @@ class Diaspora
*/
private static function receiveReshare(array $importer, $data, $xml)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$root_author = notags(XML::unescape($data->root_author));
$root_guid = notags(XML::unescape($data->root_guid));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($data->created_at)));
$root_author = Strings::removeTags(XML::unescape($data->root_author));
$root_guid = Strings::removeTags(XML::unescape($data->root_guid));
/// @todo handle unprocessed property "provider_display_name"
$public = notags(XML::unescape($data->public));
$public = Strings::removeTags(XML::unescape($data->public));
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
@ -2666,9 +2666,9 @@ class Diaspora
*/
private static function itemRetraction(array $importer, array $contact, $data)
{
$author = notags(XML::unescape($data->author));
$target_guid = notags(XML::unescape($data->target_guid));
$target_type = notags(XML::unescape($data->target_type));
$author = Strings::removeTags(XML::unescape($data->author));
$target_guid = Strings::removeTags(XML::unescape($data->target_guid));
$target_type = Strings::removeTags(XML::unescape($data->target_type));
$person = self::personByHandle($author);
if (!is_array($person)) {
@ -2730,7 +2730,7 @@ class Diaspora
*/
private static function receiveRetraction(array $importer, $sender, $data)
{
$target_type = notags(XML::unescape($data->target_type));
$target_type = Strings::removeTags(XML::unescape($data->target_type));
$contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
@ -2775,12 +2775,12 @@ class Diaspora
*/
private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{
$author = notags(XML::unescape($data->author));
$guid = notags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$public = notags(XML::unescape($data->public));
$author = Strings::removeTags(XML::unescape($data->author));
$guid = Strings::removeTags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(Strings::removeTags(XML::unescape($data->created_at)));
$public = Strings::removeTags(XML::unescape($data->public));
$text = XML::unescape($data->text);
$provider_display_name = notags(XML::unescape($data->provider_display_name));
$provider_display_name = Strings::removeTags(XML::unescape($data->provider_display_name));
$contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
@ -2795,7 +2795,7 @@ class Diaspora
$address = [];
if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(XML::unescape($data));
$address[$fieldname] = Strings::removeTags(XML::unescape($data));
}
}