X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FFileTag.php;h=a2c8bb43972a426e9647d7a5866915a2acd5d247;hb=3a4be3d5f468d5bedb56199becdaba87fd543f94;hp=02eee8aedaecf827d8c3e51326ade8546d2d4864;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index 02eee8aeda..a2c8bb4397 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -23,6 +23,7 @@ namespace Friendica\Model;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Post\Category;
 
 /**
  * This class handles FileTag related functions
@@ -195,11 +196,11 @@ class FileTag
 			if ($type == 'file') {
 				$lbracket = '[';
 				$rbracket = ']';
-				$termtype = TERM_FILE;
+				$termtype = Category::FILE;
 			} else {
 				$lbracket = '<';
 				$rbracket = '>';
-				$termtype = TERM_CATEGORY;
+				$termtype = Category::CATEGORY;
 			}
 
 			$filetags_updated = $saved;
@@ -223,13 +224,7 @@ class FileTag
 			}
 
 			foreach ($deleted_tags as $key => $tag) {
-				$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-					DBA::escape($tag),
-					intval(Term::OBJECT_TYPE_POST),
-					intval($termtype),
-					intval($uid));
-
-				if (DBA::isResult($r)) {
+				if (DBA::exists('category-view', ['name' => $tag, 'type' => $termtype, 'uid' => $uid])) {
 					unset($deleted_tags[$key]);
 				} else {
 					$filetags_updated = str_replace($lbracket . self::encode($tag) . $rbracket, '', $filetags_updated);
@@ -276,8 +271,6 @@ class FileTag
 			if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
 				DI::pConfig()->set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
 			}
-
-			info(DI::l10n()->t('Item filed'));
 		}
 
 		return true;
@@ -302,10 +295,10 @@ class FileTag
 
 		if ($cat == true) {
 			$pattern = '<' . self::encode($file) . '>';
-			$termtype = Term::CATEGORY;
+			$termtype = Category::CATEGORY;
 		} else {
 			$pattern = '[' . self::encode($file) . ']';
-			$termtype = Term::FILE;
+			$termtype = Category::FILE;
 		}
 
 		$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
@@ -318,14 +311,7 @@ class FileTag
 
 		Item::update($fields, ['id' => $item_id]);
 
-		$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-			DBA::escape($file),
-			intval(Term::OBJECT_TYPE_POST),
-			intval($termtype),
-			intval($uid)
-		);
-
-		if (!DBA::isResult($r)) {
+		if (!DBA::exists('category-view', ['name' => $file, 'type' => $termtype, 'uid' => $uid])) {
 			$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 			DI::pConfig()->set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
 		}