tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Revert "Update function calls"

Browse source 
This reverts commit 748fb8b946.
This commit is contained in:
Adam Magness 2018-11-05 07:40:18 -05:00
commit 9e51be7554
16 changed files with 110 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -25,7 +25,6 @@ use Friendica\Object\Post;
use Friendica\Object\Thread; use Friendica\Object\Thread;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -196,7 +195,7 @@ function localize_item(&$item)
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
$obj = XML::parseString($xmlhead.$item['object']); $obj = XML::parseString($xmlhead.$item['object']);
$links = XML::parseString($xmlhead."<links>".Strings::unescape($obj->link)."</links>"); $links = XML::parseString($xmlhead."<links>".XML::unescape($obj->link)."</links>");
$Bname = $obj->title; $Bname = $obj->title;
$Blink = ""; $Blink = "";

10
include/text.php
View file

@ -26,7 +26,7 @@ use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once "include/conversation.php"; require_once "include/conversation.php";
@ -974,9 +974,9 @@ function get_cats_and_terms($item)
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$categories[] = [ $categories[] = [
'name' => Strings::escape(FileTag::decode($mtch[1])), 'name' => XML::escape(FileTag::decode($mtch[1])),
'url' => "#", 'url' => "#",
'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . Strings::escape(FileTag::decode($mtch[1])):""), 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . XML::escape(FileTag::decode($mtch[1])):""),
'first' => $first, 'first' => $first,
'last' => false 'last' => false
]; ];
@ -995,9 +995,9 @@ function get_cats_and_terms($item)
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$folders[] = [ $folders[] = [
'name' => Strings::escape(FileTag::decode($mtch[1])), 'name' => XML::escape(FileTag::decode($mtch[1])),
'url' => "#", 'url' => "#",
'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . Strings::escape(FileTag::decode($mtch[1])) : ""), 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . XML::escape(FileTag::decode($mtch[1])) : ""),
'first' => $first, 'first' => $first,
'last' => false 'last' => false
]; ];

3
mod/dfrn_confirm.php
View file

@ -33,7 +33,6 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -257,7 +256,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$xml = XML::parseString($res); $xml = XML::parseString($res);
$status = (int) $xml->status; $status = (int) $xml->status;
$message = Strings::unescape($xml->message); // human readable text of what may have gone wrong. $message = XML::unescape($xml->message); // human readable text of what may have gone wrong.
switch ($status) { switch ($status) {
case 0: case 0:
info(L10n::t("Confirmation completed successfully.") . EOL); info(L10n::t("Confirmation completed successfully.") . EOL);

4
mod/filer.php
View file

@ -8,7 +8,7 @@ use Friendica\Core\Logger;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'include/items.php'; require_once 'include/items.php';
@ -18,7 +18,7 @@ function filer_content(App $a)
killme(); killme();
} }
$term = Strings::unescape(trim(defaults($_GET, 'term', ''))); $term = XML::unescape(trim(defaults($_GET, 'term', '')));
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
Logger::log('filer: tag ' . $term . ' item ' . $item_id); Logger::log('filer: tag ' . $term . ' item ' . $item_id);

6
mod/filerm.php
View file

@ -4,7 +4,7 @@ use Friendica\App;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Util\Strings; use Friendica\Util\XML;
function filerm_content(App $a) function filerm_content(App $a)
{ {
@ -13,8 +13,8 @@ function filerm_content(App $a)
killme(); killme();
} }
$term = Strings::unescape(trim($_GET['term'])); $term = XML::unescape(trim($_GET['term']));
$cat = Strings::unescape(trim($_GET['cat'])); $cat = XML::unescape(trim($_GET['cat']));
$category = (($cat) ? true : false); $category = (($cat) ? true : false);

8
mod/photos.php
View file

@ -29,8 +29,8 @@ use Friendica\Protocol\DFRN;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;
use Friendica\Util\Security; use Friendica\Util\Security;
use Friendica\Util\Strings;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use Friendica\Util\XML;
require_once 'include/items.php'; require_once 'include/items.php';
@ -683,15 +683,15 @@ function photos_post(App $a)
$arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>'; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
$arr['object'] .= '<link>' . Strings::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n"); $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
if ($tagged[3]) { if ($tagged[3]) {
$arr['object'] .= Strings::escape('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n"); $arr['object'] .= XML::escape('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
} }
$arr['object'] .= '</link></object>' . "\n"; $arr['object'] .= '</link></object>' . "\n";
$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>' $arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>'; . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
$arr['target'] .= '<link>' . Strings::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>'; $arr['target'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
$item_id = Item::insert($arr); $item_id = Item::insert($arr);
} }

4
mod/poco.php
View file

@ -15,7 +15,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\XML;
function poco_init(App $a) { function poco_init(App $a) {
$system_mode = false; $system_mode = false;
@ -376,7 +376,7 @@ function poco_init(App $a) {
if ($format === 'xml') { if ($format === 'xml') {
header('Content-type: text/xml'); header('Content-type: text/xml');
echo Renderer::replaceMacros(Renderer::getMarkupTemplate('poco_xml.tpl'), Strings::arrayEscape(['$response' => $ret])); echo Renderer::replaceMacros(Renderer::getMarkupTemplate('poco_xml.tpl'), XML::arrayEscape(['$response' => $ret]));
killme(); killme();
} }
if ($format === 'json') { if ($format === 'json') {

6
mod/poke.php
View file

@ -22,7 +22,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'include/items.php'; require_once 'include/items.php';
@ -125,9 +125,9 @@ function poke_init(App $a)
$arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]'; $arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $target['url'] . '</id>'; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $target['url'] . '</id>';
$arr['object'] .= '<link>' . Strings::escape('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n"); $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
$arr['object'] .= Strings::escape('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n"); $arr['object'] .= XML::escape('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
$arr['object'] .= '</link></object>' . "\n"; $arr['object'] .= '</link></object>' . "\n";
$item_id = Item::insert($arr); $item_id = Item::insert($arr);

4
mod/profile.php
View file

@ -24,7 +24,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Security; use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\XML;
function profile_init(App $a) function profile_init(App $a)
{ {
@ -210,7 +210,7 @@ function profile_content(App $a, $update = 0)
$commvisitor = $commpage && $remote_contact; $commvisitor = $commpage && $remote_contact;
$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true); $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
$a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? Strings::escape($category) : '')); $a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? XML::escape($category) : ''));
$a->page['aside'] .= Widget::tagCloud(); $a->page['aside'] .= Widget::tagCloud();
if (Security::canWriteToUserWall($a->profile['profile_uid'])) { if (Security::canWriteToUserWall($a->profile['profile_uid'])) {

4
mod/subthread.php
View file

@ -10,7 +10,7 @@ use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Security; use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'include/items.php'; require_once 'include/items.php';
@ -88,7 +88,7 @@ function subthread_content(App $a) {
$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ); $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
$link = Strings::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ; $link = XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$body = $item['body']; $body = $item['body'];
$obj = <<< EOT $obj = <<< EOT

8
mod/tagger.php
View file

@ -10,7 +10,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'include/items.php'; require_once 'include/items.php';
@ -67,7 +67,7 @@ function tagger_content(App $a) {
} }
$uri = Item::newURI($owner_uid); $uri = Item::newURI($owner_uid);
$xterm = Strings::escape($term); $xterm = XML::escape($term);
$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ); $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
@ -77,9 +77,9 @@ function tagger_content(App $a) {
$href = System::baseUrl() . '/display/' . $item['guid']; $href = System::baseUrl() . '/display/' . $item['guid'];
} }
$link = Strings::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ; $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
$body = Strings::escape($item['body']); $body = XML::escape($item['body']);
$target = <<< EOT $target = <<< EOT
<target> <target>

6
src/Content/Widget.php
View file

@ -18,7 +18,7 @@ use Friendica\Model\Contact;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -190,7 +190,7 @@ class Widget
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) foreach ($matches as $mtch)
{ {
$unescaped = Strings::escape(FileTag::decode($mtch[1])); $unescaped = XML::escape(FileTag::decode($mtch[1]));
$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
} }
} }
@ -230,7 +230,7 @@ class Widget
if ($cnt) { if ($cnt) {
foreach ($matches as $mtch) { foreach ($matches as $mtch) {
$unescaped = Strings::escape(FileTag::decode($mtch[1])); $unescaped = XML::escape(FileTag::decode($mtch[1]));
$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
} }
} }

10
src/Model/Event.php
View file

@ -17,7 +17,7 @@ use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;
use Friendica\Util\Strings; use Friendica\Util\XML;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -303,8 +303,8 @@ class Event extends BaseObject
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]); $item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
$object = '<object><type>' . Strings::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . Strings::escape($event['uri']) . '</id>'; $object = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
$object .= '<content>' . Strings::escape(self::getBBCode($event)) . '</content>'; $object .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
$object .= '</object>' . "\n"; $object .= '</object>' . "\n";
$fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']]; $fields = ['body' => self::getBBCode($event), 'object' => $object, 'edited' => $event['edited']];
@ -354,8 +354,8 @@ class Event extends BaseObject
$item_arr['body'] = self::getBBCode($event); $item_arr['body'] = self::getBBCode($event);
$item_arr['event-id'] = $event['id']; $item_arr['event-id'] = $event['id'];
$item_arr['object'] = '<object><type>' . Strings::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . Strings::escape($event['uri']) . '</id>'; $item_arr['object'] = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
$item_arr['object'] .= '<content>' . Strings::escape(self::getBBCode($event)) . '</content>'; $item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
$item_arr['object'] .= '</object>' . "\n"; $item_arr['object'] .= '</object>' . "\n";
$item_id = Item::insert($item_arr); $item_id = Item::insert($item_arr);

3
src/Protocol/DFRN.php
View file

@ -33,7 +33,6 @@ use Friendica\Object\Image;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
use HTMLPurifier; use HTMLPurifier;
use HTMLPurifier_Config; use HTMLPurifier_Config;
@ -2548,7 +2547,7 @@ class DFRN
$item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry); $item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry);
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert" // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
$dsprsig = Strings::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry)); $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
if ($dsprsig != "") { if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig; $item["dsprsig"] = $dsprsig;
} }

143
src/Protocol/Diaspora.php
View file

@ -34,7 +34,6 @@ use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;
use SimpleXMLElement; use SimpleXMLElement;
@ -464,7 +463,7 @@ class Diaspora
} }
return ['message' => (string)base64url_decode($base->data), return ['message' => (string)base64url_decode($base->data),
'author' => Strings::unescape($author_addr), 'author' => XML::unescape($author_addr),
'key' => (string)$key]; 'key' => (string)$key];
} }
@ -604,7 +603,7 @@ class Diaspora
Logger::log('Message verified.'); Logger::log('Message verified.');
return ['message' => (string)$inner_decrypted, return ['message' => (string)$inner_decrypted,
'author' => Strings::unescape($author_link), 'author' => XML::unescape($author_link),
'key' => (string)$key]; 'key' => (string)$key];
} }
@ -1506,9 +1505,9 @@ class Diaspora
*/ */
private static function receiveAccountMigration(array $importer, $data) private static function receiveAccountMigration(array $importer, $data)
{ {
$old_handle = notags(Strings::unescape($data->author)); $old_handle = notags(XML::unescape($data->author));
$new_handle = notags(Strings::unescape($data->profile->author)); $new_handle = notags(XML::unescape($data->profile->author));
$signature = notags(Strings::unescape($data->signature)); $signature = notags(XML::unescape($data->signature));
$contact = self::contactByHandle($importer["uid"], $old_handle); $contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) { if (!$contact) {
@ -1566,7 +1565,7 @@ class Diaspora
*/ */
private static function receiveAccountDeletion($data) private static function receiveAccountDeletion($data)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$contacts = DBA::select('contact', ['id'], ['addr' => $author]); $contacts = DBA::select('contact', ['id'], ['addr' => $author]);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {
@ -1657,19 +1656,19 @@ class Diaspora
*/ */
private static function receiveComment(array $importer, $sender, $data, $xml) private static function receiveComment(array $importer, $sender, $data, $xml)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$parent_guid = notags(Strings::unescape($data->parent_guid)); $parent_guid = notags(XML::unescape($data->parent_guid));
$text = Strings::unescape($data->text); $text = XML::unescape($data->text);
if (isset($data->created_at)) { if (isset($data->created_at)) {
$created_at = DateTimeFormat::utc(notags(Strings::unescape($data->created_at))); $created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
} else { } else {
$created_at = DateTimeFormat::utcNow(); $created_at = DateTimeFormat::utcNow();
} }
if (isset($data->thread_parent_guid)) { if (isset($data->thread_parent_guid)) {
$thread_parent_guid = notags(Strings::unescape($data->thread_parent_guid)); $thread_parent_guid = notags(XML::unescape($data->thread_parent_guid));
$thr_uri = self::getUriFromGuid("", $thread_parent_guid, true); $thr_uri = self::getUriFromGuid("", $thread_parent_guid, true);
} else { } else {
$thr_uri = ""; $thr_uri = "";
@ -1774,24 +1773,24 @@ class Diaspora
*/ */
private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation) private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$subject = notags(Strings::unescape($data->subject)); $subject = notags(XML::unescape($data->subject));
// "diaspora_handle" is the element name from the old version // "diaspora_handle" is the element name from the old version
// "author" is the element name from the new version // "author" is the element name from the new version
if ($mesg->author) { if ($mesg->author) {
$msg_author = notags(Strings::unescape($mesg->author)); $msg_author = notags(XML::unescape($mesg->author));
} elseif ($mesg->diaspora_handle) { } elseif ($mesg->diaspora_handle) {
$msg_author = notags(Strings::unescape($mesg->diaspora_handle)); $msg_author = notags(XML::unescape($mesg->diaspora_handle));
} else { } else {
return false; return false;
} }
$msg_guid = notags(Strings::unescape($mesg->guid)); $msg_guid = notags(XML::unescape($mesg->guid));
$msg_conversation_guid = notags(Strings::unescape($mesg->conversation_guid)); $msg_conversation_guid = notags(XML::unescape($mesg->conversation_guid));
$msg_text = Strings::unescape($mesg->text); $msg_text = XML::unescape($mesg->text);
$msg_created_at = DateTimeFormat::utc(notags(Strings::unescape($mesg->created_at))); $msg_created_at = DateTimeFormat::utc(notags(XML::unescape($mesg->created_at)));
if ($msg_conversation_guid != $guid) { if ($msg_conversation_guid != $guid) {
Logger::log("message conversation guid does not belong to the current conversation."); Logger::log("message conversation guid does not belong to the current conversation.");
@ -1862,11 +1861,11 @@ class Diaspora
*/ */
private static function receiveConversation(array $importer, $msg, $data) private static function receiveConversation(array $importer, $msg, $data)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$subject = notags(Strings::unescape($data->subject)); $subject = notags(XML::unescape($data->subject));
$created_at = DateTimeFormat::utc(notags(Strings::unescape($data->created_at))); $created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$participants = notags(Strings::unescape($data->participants)); $participants = notags(XML::unescape($data->participants));
$messages = $data->message; $messages = $data->message;
@ -1920,11 +1919,11 @@ class Diaspora
*/ */
private static function receiveLike(array $importer, $sender, $data) private static function receiveLike(array $importer, $sender, $data)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$parent_guid = notags(Strings::unescape($data->parent_guid)); $parent_guid = notags(XML::unescape($data->parent_guid));
$parent_type = notags(Strings::unescape($data->parent_type)); $parent_type = notags(XML::unescape($data->parent_type));
$positive = notags(Strings::unescape($data->positive)); $positive = notags(XML::unescape($data->positive));
// likes on comments aren't supported by Diaspora - only on posts // 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. // But maybe this will be supported in the future, so we will accept it.
@ -2029,11 +2028,11 @@ class Diaspora
*/ */
private static function receiveMessage(array $importer, $data) private static function receiveMessage(array $importer, $data)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$conversation_guid = notags(Strings::unescape($data->conversation_guid)); $conversation_guid = notags(XML::unescape($data->conversation_guid));
$text = Strings::unescape($data->text); $text = XML::unescape($data->text);
$created_at = DateTimeFormat::utc(notags(Strings::unescape($data->created_at))); $created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$contact = self::allowedContactByHandle($importer, $author, true); $contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) { if (!$contact) {
@ -2104,8 +2103,8 @@ class Diaspora
*/ */
private static function receiveParticipation(array $importer, $data) private static function receiveParticipation(array $importer, $data)
{ {
$author = strtolower(notags(Strings::unescape($data->author))); $author = strtolower(notags(XML::unescape($data->author)));
$parent_guid = notags(Strings::unescape($data->parent_guid)); $parent_guid = notags(XML::unescape($data->parent_guid));
$contact_id = Contact::getIdForURL($author); $contact_id = Contact::getIdForURL($author);
if (!$contact_id) { if (!$contact_id) {
@ -2197,22 +2196,22 @@ class Diaspora
*/ */
private static function receiveProfile(array $importer, $data) private static function receiveProfile(array $importer, $data)
{ {
$author = strtolower(notags(Strings::unescape($data->author))); $author = strtolower(notags(XML::unescape($data->author)));
$contact = self::contactByHandle($importer["uid"], $author); $contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) { if (!$contact) {
return false; return false;
} }
$name = Strings::unescape($data->first_name).((strlen($data->last_name)) ? " ".Strings::unescape($data->last_name) : ""); $name = XML::unescape($data->first_name).((strlen($data->last_name)) ? " ".XML::unescape($data->last_name) : "");
$image_url = Strings::unescape($data->image_url); $image_url = XML::unescape($data->image_url);
$birthday = Strings::unescape($data->birthday); $birthday = XML::unescape($data->birthday);
$gender = Strings::unescape($data->gender); $gender = XML::unescape($data->gender);
$about = Markdown::toBBCode(Strings::unescape($data->bio)); $about = Markdown::toBBCode(XML::unescape($data->bio));
$location = Markdown::toBBCode(Strings::unescape($data->location)); $location = Markdown::toBBCode(XML::unescape($data->location));
$searchable = (Strings::unescape($data->searchable) == "true"); $searchable = (XML::unescape($data->searchable) == "true");
$nsfw = (Strings::unescape($data->nsfw) == "true"); $nsfw = (XML::unescape($data->nsfw) == "true");
$tags = Strings::unescape($data->tag_string); $tags = XML::unescape($data->tag_string);
$tags = explode("#", $tags); $tags = explode("#", $tags);
@ -2311,8 +2310,8 @@ class Diaspora
*/ */
private static function receiveContactRequest(array $importer, $data) private static function receiveContactRequest(array $importer, $data)
{ {
$author = Strings::unescape($data->author); $author = XML::unescape($data->author);
$recipient = Strings::unescape($data->recipient); $recipient = XML::unescape($data->recipient);
if (!$author || !$recipient) { if (!$author || !$recipient) {
return false; return false;
@ -2321,13 +2320,13 @@ class Diaspora
// the current protocol version doesn't know these fields // the current protocol version doesn't know these fields
// That means that we will assume their existance // That means that we will assume their existance
if (isset($data->following)) { if (isset($data->following)) {
$following = (Strings::unescape($data->following) == "true"); $following = (XML::unescape($data->following) == "true");
} else { } else {
$following = true; $following = true;
} }
if (isset($data->sharing)) { if (isset($data->sharing)) {
$sharing = (Strings::unescape($data->sharing) == "true"); $sharing = (XML::unescape($data->sharing) == "true");
} else { } else {
$sharing = true; $sharing = true;
} }
@ -2574,13 +2573,13 @@ class Diaspora
*/ */
private static function receiveReshare(array $importer, $data, $xml) private static function receiveReshare(array $importer, $data, $xml)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(notags(Strings::unescape($data->created_at))); $created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$root_author = notags(Strings::unescape($data->root_author)); $root_author = notags(XML::unescape($data->root_author));
$root_guid = notags(Strings::unescape($data->root_guid)); $root_guid = notags(XML::unescape($data->root_guid));
/// @todo handle unprocessed property "provider_display_name" /// @todo handle unprocessed property "provider_display_name"
$public = notags(Strings::unescape($data->public)); $public = notags(XML::unescape($data->public));
$contact = self::allowedContactByHandle($importer, $author, false); $contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) { if (!$contact) {
@ -2666,9 +2665,9 @@ class Diaspora
*/ */
private static function itemRetraction(array $importer, array $contact, $data) private static function itemRetraction(array $importer, array $contact, $data)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$target_guid = notags(Strings::unescape($data->target_guid)); $target_guid = notags(XML::unescape($data->target_guid));
$target_type = notags(Strings::unescape($data->target_type)); $target_type = notags(XML::unescape($data->target_type));
$person = self::personByHandle($author); $person = self::personByHandle($author);
if (!is_array($person)) { if (!is_array($person)) {
@ -2730,7 +2729,7 @@ class Diaspora
*/ */
private static function receiveRetraction(array $importer, $sender, $data) private static function receiveRetraction(array $importer, $sender, $data)
{ {
$target_type = notags(Strings::unescape($data->target_type)); $target_type = notags(XML::unescape($data->target_type));
$contact = self::contactByHandle($importer["uid"], $sender); $contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, ["Contact", "Person"]))) { if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
@ -2775,12 +2774,12 @@ class Diaspora
*/ */
private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml) private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{ {
$author = notags(Strings::unescape($data->author)); $author = notags(XML::unescape($data->author));
$guid = notags(Strings::unescape($data->guid)); $guid = notags(XML::unescape($data->guid));
$created_at = DateTimeFormat::utc(notags(Strings::unescape($data->created_at))); $created_at = DateTimeFormat::utc(notags(XML::unescape($data->created_at)));
$public = notags(Strings::unescape($data->public)); $public = notags(XML::unescape($data->public));
$text = Strings::unescape($data->text); $text = XML::unescape($data->text);
$provider_display_name = notags(Strings::unescape($data->provider_display_name)); $provider_display_name = notags(XML::unescape($data->provider_display_name));
$contact = self::allowedContactByHandle($importer, $author, false); $contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) { if (!$contact) {
@ -2795,7 +2794,7 @@ class Diaspora
$address = []; $address = [];
if ($data->location) { if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) { foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(Strings::unescape($data)); $address[$fieldname] = notags(XML::unescape($data));
} }
} }
@ -2806,8 +2805,8 @@ class Diaspora
// Attach embedded pictures to the body // Attach embedded pictures to the body
if ($data->photo) { if ($data->photo) {
foreach ($data->photo as $photo) { foreach ($data->photo as $photo) {
$body = "[img]".Strings::unescape($photo->remote_photo_path). $body = "[img]".XML::unescape($photo->remote_photo_path).
Strings::unescape($photo->remote_photo_name)."[/img]\n".$body; XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
} }
$datarray["object-type"] = ACTIVITY_OBJ_IMAGE; $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;

2
src/Util/Strings.php
View file

@ -44,7 +44,7 @@ class Strings
if (is_bool($val)) { if (is_bool($val)) {
return $val?"true":"false"; return $val?"true":"false";
} elseif (is_array($val)) { } elseif (is_array($val)) {
return array_map('Strings::arrayEscape', $val); return array_map('XML::arrayEscape', $val);
} }
return self::escape((string) $val); return self::escape((string) $val);
} }