X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FThread.php;h=7d59759a0da861ae3bbfbd91de9fcc0a7acf05c8;hb=a65fbcebe785d33a8053645cb73dfd11d032a940;hp=4eda1f8f7eedd2c730b36f26c9613b2d3774c2a6;hpb=b543ee8ac78168328c7a7f2d725ee01bb333e941;p=friendica.git diff --git a/src/Object/Thread.php b/src/Object/Thread.php index 4eda1f8f7e..7d59759a0d 100644 --- a/src/Object/Thread.php +++ b/src/Object/Thread.php @@ -1,22 +1,40 @@ . + * */ + namespace Friendica\Object; -use Friendica\BaseObject; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\DI; use Friendica\Protocol\Activity; -use Friendica\Util\Security; +use Friendica\Security\Security; /** * A list of threads * * We should think about making this a SPL Iterator */ -class Thread extends BaseObject +class Thread { + /** @var Post[] */ private $parents = []; private $mode = null; private $writable = false; @@ -52,7 +70,7 @@ class Thread extends BaseObject return; } - $a = self::getApp(); + $a = DI::app(); switch ($mode) { case 'network': @@ -61,11 +79,11 @@ class Thread extends BaseObject $this->writable = true; break; case 'profile': - $this->profile_owner = $a->profile['profile_uid']; + $this->profile_owner = $a->getProfileOwner(); $this->writable = Security::canWriteToUserWall($this->profile_owner); break; case 'display': - $this->profile_owner = $a->profile['uid']; + $this->profile_owner = $a->getProfileOwner(); $this->writable = Security::canWriteToUserWall($this->profile_owner) || $writable; break; case 'community': @@ -172,12 +190,13 @@ class Thread extends BaseObject * We should find a way to avoid using those arguments (at least most of them) * * @param array $conv_responses data + * @param string $formSecurityToken A security Token to avoid CSF attacks * * @return mixed The data requested on success * false on failure * @throws \Exception */ - public function getTemplateData($conv_responses) + public function getTemplateData($conv_responses, string $formSecurityToken) { $result = []; @@ -186,7 +205,7 @@ class Thread extends BaseObject continue; } - $item_data = $item->getTemplateData($conv_responses); + $item_data = $item->getTemplateData($conv_responses, $formSecurityToken); if (!$item_data) { Logger::log('[ERROR] Conversation::getTemplateData : Failed to get item template data ('. $item->getId() .').', Logger::DEBUG);