X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fignored.php;h=4f14119fef876d792e9b3f1e684139a09fb9812f;hb=6bc865ff4d68170c83a675cfc75cdc025a192b15;hp=0379d2d94509e52f5a6db230842d0533c90b5fce;hpb=cfa68c52b9117616fa95a4639ad74e7d220d193d;p=friendica.git

diff --git a/mod/ignored.php b/mod/ignored.php
index 0379d2d945..4f14119fef 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -3,47 +3,47 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
-function ignored_init(App $a) {
-
-	$ignored = 0;
-
-	if (! local_user()) {
+function ignored_init(App $a)
+{
+	if (!local_user()) {
 		killme();
 	}
+
 	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
 	}
-	if (! $message_id) {
+
+	if (!$message_id) {
 		killme();
 	}
 
-	$r = q("SELECT `ignored` FROM `thread` WHERE `uid` = %d AND `iid` = %d LIMIT 1",
-		intval(local_user()),
-		intval($message_id)
-	);
-	if (! DBA::isResult($r)) {
+	$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
+	if (!DBA::isResult($thread)) {
 		killme();
 	}
 
-	if (! intval($r[0]['ignored'])) {
-		$ignored = 1;
-	}
+	// Numeric values are needed for the json output further below
+	$ignored = ($thread['ignored'] ? 0 : 1);
 
-	$r = q("UPDATE `thread` SET `ignored` = %d WHERE `uid` = %d and `iid` = %d",
-		intval($ignored),
-		intval(local_user()),
-		intval($message_id)
-	);
+	if ($thread['uid'] != 0) {
+		DBA::update('thread', ['ignored' => $ignored], ['iid' => $message_id]);
+	} else {
+		DBA::update('user-item', ['ignored' => $ignored], ['iid' => $message_id, 'uid' => local_user()], true);
+	}
 
 	// See if we've been passed a return path to redirect to
-	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+	$return_path = defaults($_REQUEST, 'return', '');
 	if ($return_path) {
 		$rand = '_=' . time();
-		if(strpos($return_path, '?')) $rand = "&$rand";
-		else $rand = "?$rand";
+		if (strpos($return_path, '?')) {
+			$rand = "&$rand";
+		} else {
+			$rand = "?$rand";
+		}
 
-		goaway(System::baseUrl() . "/" . $return_path . $rand);
+		$a->internalRedirect($return_path . $rand);
 	}
 
 	// the json doesn't really matter, it will either be 0 or 1