From: Philipp Holzer <admin+github@philipp.info>
Date: Thu, 24 Oct 2019 07:09:47 +0000 (+0200)
Subject: Rename module class name
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5aa73afa7e4ffcd005d7a2ff3af8330ce1c90b15;p=friendica.git

Rename module class name
---

diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php
new file mode 100644
index 0000000000..362b6c9baa
--- /dev/null
+++ b/src/Module/Item/Ignore.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Friendica\Module\Item;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Core\L10n\L10n;
+use Friendica\Core\Session;
+use Friendica\Core\System;
+use Friendica\Database\Database;
+use Friendica\Model\Item;
+use Friendica\Network\HTTPException;
+
+/**
+ * Module for ignoring threads or user items
+ */
+class Ignore extends BaseModule
+{
+	public static function rawContent()
+	{
+		/** @var L10n $l10n */
+		$l10n = self::getClass(L10n::class);
+
+		if (!Session::isAuthenticated()) {
+			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
+		}
+
+		/** @var App\Arguments $args */
+		$args = self::getClass(App\Arguments::class);
+		/** @var Database $dba */
+		$dba = self::getClass(Database::class);
+
+		$message_id = intval($args->get(1));
+
+		if (empty($message_id) || !is_int($message_id)) {
+			throw new HTTPException\BadRequestException();
+		}
+
+		$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
+		if (!$dba->isResult($thread)) {
+			throw new HTTPException\BadRequestException();
+		}
+
+		// Numeric values are needed for the json output further below
+		$ignored = !empty($thread['ignored']) ? 0 : 1;
+
+		switch ($thread['uid'] ?? 0) {
+			// if the thread is from the current user
+			case local_user():
+				$dba->update('thread', ['ignored' => $ignored], ['iid' => $message_id]);
+				break;
+			// 0 (null will get transformed to 0) => it's a public post
+			case 0:
+				$dba->update('user-item', ['ignored' => $ignored], ['iid' => $message_id, 'uid' => local_user()], true);
+				break;
+			// Throws a BadRequestException and not a ForbiddenException on purpose
+			// Avoids harvesting existing, but forbidden IIDs (security issue)
+			default:
+				throw new HTTPException\BadRequestException();
+		}
+
+		// See if we've been passed a return path to redirect to
+		$return_path = $_REQUEST['return'] ?? '';
+		if (!empty($return_path)) {
+			$rand = '_=' . time();
+			if (strpos($return_path, '?')) {
+				$rand = "&$rand";
+			} else {
+				$rand = "?$rand";
+			}
+
+			self::getApp()->internalRedirect($return_path . $rand);
+		}
+
+		// the json doesn't really matter, it will either be 0 or 1
+		System::jsonExit([$ignored]);
+	}
+}
diff --git a/src/Module/Item/Ignored.php b/src/Module/Item/Ignored.php
deleted file mode 100644
index f37c5ab3a7..0000000000
--- a/src/Module/Item/Ignored.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Friendica\Module\Item;
-
-use Friendica\App;
-use Friendica\BaseModule;
-use Friendica\Core\L10n\L10n;
-use Friendica\Core\Session;
-use Friendica\Core\System;
-use Friendica\Database\Database;
-use Friendica\Model\Item;
-use Friendica\Network\HTTPException;
-
-/**
- * Module for ignoring threads or user items
- */
-class Ignored extends BaseModule
-{
-	public static function rawContent()
-	{
-		/** @var L10n $l10n */
-		$l10n = self::getClass(L10n::class);
-
-		if (!Session::isAuthenticated()) {
-			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
-		}
-
-		/** @var App\Arguments $args */
-		$args = self::getClass(App\Arguments::class);
-		/** @var Database $dba */
-		$dba = self::getClass(Database::class);
-
-		$message_id = intval($args->get(1));
-
-		if (empty($message_id) || !is_int($message_id)) {
-			throw new HTTPException\BadRequestException();
-		}
-
-		$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
-		if (!$dba->isResult($thread)) {
-			throw new HTTPException\BadRequestException();
-		}
-
-		// Numeric values are needed for the json output further below
-		$ignored = !empty($thread['ignored']) ? 0 : 1;
-
-		switch ($thread['uid'] ?? 0) {
-			// if the thread is from the current user
-			case local_user():
-				$dba->update('thread', ['ignored' => $ignored], ['iid' => $message_id]);
-				break;
-			// 0 (null will get transformed to 0) => it's a public post
-			case 0:
-				$dba->update('user-item', ['ignored' => $ignored], ['iid' => $message_id, 'uid' => local_user()], true);
-				break;
-			// Throws a BadRequestException and not a ForbiddenException on purpose
-			// Avoids harvesting existing, but forbidden IIDs (security issue)
-			default:
-				throw new HTTPException\BadRequestException();
-		}
-
-		// See if we've been passed a return path to redirect to
-		$return_path = $_REQUEST['return'] ?? '';
-		if (!empty($return_path)) {
-			$rand = '_=' . time();
-			if (strpos($return_path, '?')) {
-				$rand = "&$rand";
-			} else {
-				$rand = "?$rand";
-			}
-
-			self::getApp()->internalRedirect($return_path . $rand);
-		}
-
-		// the json doesn't really matter, it will either be 0 or 1
-		System::jsonExit([$ignored]);
-	}
-}
diff --git a/static/routes.config.php b/static/routes.config.php
index 32a9f12edf..cce7789cd5 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -131,7 +131,7 @@ return [
 	'/hashtag'            => [Module\Hashtag::class,      [R::GET]],
 	'/home'               => [Module\Home::class,         [R::GET]],
 	'/help[/{doc:.+}]'    => [Module\Help::class,         [R::GET]],
-	'/ignored/{id}'       => [Module\Item\Ignored::class, [R::GET]],
+	'/ignored/{id}'       => [Module\Item\Ignore::class, [R::GET]],
 	'/inbox[/{nickname}]' => [Module\Inbox::class,        [R::GET, R::POST]],
 	'/invite'             => [Module\Invite::class,       [R::GET, R::POST]],