X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fignored.php;h=64edf6e151c17d7a6dac97ee727259d016ef6883;hb=80f81e670c721067cddf0ffff4ed4f2def1ad69c;hp=ba55c55e368925648bad537fec37fe8ede477a8e;hpb=8039ad0e2318c28a22f87c31dbbdb3165f1ef058;p=friendica.git

diff --git a/mod/ignored.php b/mod/ignored.php
index ba55c55e36..64edf6e151 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -1,45 +1,52 @@
 <?php
 
+use Friendica\App;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+
+function ignored_init(App $a)
+{
+	if (!local_user()) {
+		exit();
+	}
 
-function ignored_init(&$a) {
-
-	$ignored = 0;
-
-	if(! local_user())
-		killme();
-	if($a->argc > 1)
+	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
-	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(! dbm::is_result($r))
-		killme();
+	if (empty($message_id)) {
+		exit();
+	}
+
+	$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
+	if (!DBA::isResult($thread)) {
+		exit();
+	}
 
-	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'] : '');
-	if($return_path) {
+	$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($a->get_baseurl() . "/" . $return_path . $rand);
+		$a->internalRedirect($return_path . $rand);
 	}
 
 	// the json doesn't really matter, it will either be 0 or 1
 
 	echo json_encode($ignored);
-	killme();
+	exit();
 }