X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FThread.php;h=89ed5a9408bd506e7f340db4ec3b82ce33410e01;hb=694cf50509565408360aafd91b2a2cd69d46e619;hp=08c04f546f3b6f93973073e100061b8ee000456d;hpb=2f7f9ffdd827dca6996a894fac662e7c77f8e713;p=friendica.git

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index 08c04f546f..89ed5a9408 100644
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -5,13 +5,10 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Object\Post;
 use Friendica\Util\Security;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * A list of threads
  *
@@ -28,9 +25,10 @@ class Thread extends BaseObject
 	/**
 	 * Constructor
 	 *
-	 * @param string  $mode    The mode
-	 * @param boolean $preview Are we in the preview mode?
+	 * @param string  $mode     The mode
+	 * @param boolean $preview  Are we in the preview mode?
 	 * @param boolean $writable Override the writable check
+	 * @throws \Exception
 	 */
 	public function __construct($mode, $preview, $writable = false)
 	{
@@ -41,10 +39,11 @@ class Thread extends BaseObject
 	/**
 	 * Set the mode we'll be displayed on
 	 *
-	 * @param string $mode The mode to set
+	 * @param string  $mode     The mode to set
 	 * @param boolean $writable Override the writable check
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	private function setMode($mode, $writable)
 	{
@@ -77,7 +76,7 @@ class Thread extends BaseObject
 				$this->writable = $writable;
 				break;
 			default:
-				logger('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
+				Logger::log('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', Logger::DEBUG);
 				return false;
 				break;
 		}
@@ -127,22 +126,23 @@ class Thread extends BaseObject
 	/**
 	 * Add a thread to the conversation
 	 *
-	 * @param object $item The item to insert
+	 * @param Post $item The item to insert
 	 *
 	 * @return mixed The inserted item on success
 	 *               false on failure
+	 * @throws \Exception
 	 */
 	public function addParent(Post $item)
 	{
 		$item_id = $item->getId();
 
 		if (!$item_id) {
-			logger('[ERROR] Conversation::addThread : Item has no ID!!', LOGGER_DEBUG);
+			Logger::log('[ERROR] Conversation::addThread : Item has no ID!!', Logger::DEBUG);
 			return false;
 		}
 
 		if ($this->getParent($item->getId())) {
-			logger('[WARN] Conversation::addThread : Thread already exists ('. $item->getId() .').', LOGGER_DEBUG);
+			Logger::log('[WARN] Conversation::addThread : Thread already exists ('. $item->getId() .').', Logger::DEBUG);
 			return false;
 		}
 
@@ -150,12 +150,12 @@ class Thread extends BaseObject
 		 * Only add will be displayed
 		 */
 		if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
-			logger('[WARN] Conversation::addThread : Thread is a mail ('. $item->getId() .').', LOGGER_DEBUG);
+			Logger::log('[WARN] Conversation::addThread : Thread is a mail ('. $item->getId() .').', Logger::DEBUG);
 			return false;
 		}
 
 		if ($item->getDataValue('verb') === ACTIVITY_LIKE || $item->getDataValue('verb') === ACTIVITY_DISLIKE) {
-			logger('[WARN] Conversation::addThread : Thread is a (dis)like ('. $item->getId() .').', LOGGER_DEBUG);
+			Logger::log('[WARN] Conversation::addThread : Thread is a (dis)like ('. $item->getId() .').', Logger::DEBUG);
 			return false;
 		}
 
@@ -170,16 +170,15 @@ class Thread extends BaseObject
 	 *
 	 * We should find a way to avoid using those arguments (at least most of them)
 	 *
-	 * @param object $conv_responses data
+	 * @param array $conv_responses data
 	 *
 	 * @return mixed The data requested on success
 	 *               false on failure
+	 * @throws \Exception
 	 */
 	public function getTemplateData($conv_responses)
 	{
-		$a = self::getApp();
 		$result = [];
-		$i = 0;
 
 		foreach ($this->parents as $item) {
 			if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
@@ -189,7 +188,7 @@ class Thread extends BaseObject
 			$item_data = $item->getTemplateData($conv_responses);
 
 			if (!$item_data) {
-				logger('[ERROR] Conversation::getTemplateData : Failed to get item template data ('. $item->getId() .').', LOGGER_DEBUG);
+				Logger::log('[ERROR] Conversation::getTemplateData : Failed to get item template data ('. $item->getId() .').', Logger::DEBUG);
 				return false;
 			}
 			$result[] = $item_data;