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

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index c743cb1278..a2c8bb4397 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -1,16 +1,32 @@
 <?php
 /**
- * @file src/Model/FileTag.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Post\Category;
 
 /**
- * @brief This class handles FileTag related functions
+ * This class handles FileTag related functions
  *
  * post categories and "save to file" use the same item.file table for storage.
  * We will differentiate the different uses by wrapping categories in angle brackets
@@ -20,7 +36,7 @@ use Friendica\Database\DBA;
 class FileTag
 {
 	/**
-	 * @brief URL encode <, >, left and right brackets
+	 * URL encode <, >, left and right brackets
 	 *
 	 * @param string $s String to be URL encoded.
 	 *
@@ -32,7 +48,7 @@ class FileTag
 	}
 
 	/**
-	 * @brief URL decode <, >, left and right brackets
+	 * URL decode <, >, left and right brackets
 	 *
 	 * @param string $s The URL encoded string to be decoded
 	 *
@@ -44,7 +60,7 @@ class FileTag
 	}
 
 	/**
-	 * @brief Query files for tag
+	 * Query files for tag
 	 *
 	 * @param string $table The table to be queired.
 	 * @param string $s     The search term
@@ -124,7 +140,7 @@ class FileTag
 	}
 
 	/**
-	 * @brief      Get file tags from list
+	 * Get file tags from list
 	 *
 	 * ex. given music,video return <music><video> or [music][video]
 	 * @param string $list A comma delimited list of tags.
@@ -133,7 +149,7 @@ class FileTag
 	 * @return string       A list of file tags.
 	 * @deprecated since 2019.06 use arrayToFile() instead
 	 */
-	public static function listToFile($list, $type = 'file')
+	public static function listToFile(string $list, string $type = 'file')
 	{
 		$list_array = explode(',', $list);
 
@@ -141,7 +157,7 @@ class FileTag
 	}
 
 	/**
-	 * @brief      Get list from file tags
+	 * Get list from file tags
 	 *
 	 * ex. given <music><video>[friends], return music,video or friends
 	 * @param string $file File tags
@@ -150,13 +166,13 @@ class FileTag
 	 * @return string       Comma delimited list of tag names.
 	 * @deprecated since 2019.06 use fileToArray() instead
 	 */
-	public static function fileToList($file, $type = 'file')
+	public static function fileToList(string $file, $type = 'file')
 	{
 		return implode(',', self::fileToArray($file, $type));
 	}
 
 	/**
-	 * @brief Update file tags in PConfig
+	 * Update file tags in PConfig
 	 *
 	 * @param int    $uid      Unique Identity.
 	 * @param string $file_old Categories previously associated with an item
@@ -166,7 +182,7 @@ class FileTag
 	 * @return boolean          A value indicating success or failure.
 	 * @throws \Exception
 	 */
-	public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
+	public static function updatePconfig(int $uid, string $file_old, string $file_new, string $type = 'file')
 	{
 		if (!intval($uid)) {
 			return false;
@@ -174,17 +190,17 @@ class FileTag
 			return true;
 		}
 
-		$saved = PConfig::get($uid, 'system', 'filetags');
+		$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
 		if (strlen($saved)) {
 			if ($type == 'file') {
 				$lbracket = '[';
 				$rbracket = ']';
-				$termtype = TERM_FILE;
+				$termtype = Category::FILE;
 			} else {
 				$lbracket = '<';
 				$rbracket = '>';
-				$termtype = TERM_CATEGORY;
+				$termtype = Category::CATEGORY;
 			}
 
 			$filetags_updated = $saved;
@@ -208,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);
@@ -222,19 +232,19 @@ class FileTag
 			}
 
 			if ($saved != $filetags_updated) {
-				PConfig::set($uid, 'system', 'filetags', $filetags_updated);
+				DI::pConfig()->set($uid, 'system', 'filetags', $filetags_updated);
 			}
 
 			return true;
 		} elseif (strlen($file_new)) {
-			PConfig::set($uid, 'system', 'filetags', $file_new);
+			DI::pConfig()->set($uid, 'system', 'filetags', $file_new);
 		}
 
 		return true;
 	}
 
 	/**
-	 * @brief Add tag to file
+	 * Add tag to file
 	 *
 	 * @param int    $uid     Unique identity.
 	 * @param int    $item_id Item identity.
@@ -256,20 +266,18 @@ class FileTag
 				Item::update($fields, ['id' => $item_id]);
 			}
 
-			$saved = PConfig::get($uid, 'system', 'filetags');
+			$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
 			if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
-				PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
+				DI::pConfig()->set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
 			}
-
-			info(L10n::t('Item filed'));
 		}
 
 		return true;
 	}
 
 	/**
-	 * @brief Remove tag from file
+	 * Remove tag from file
 	 *
 	 * @param int     $uid     Unique identity.
 	 * @param int     $item_id Item identity.
@@ -287,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]);
@@ -303,16 +311,9 @@ 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)) {
-			$saved = PConfig::get($uid, 'system', 'filetags');
-			PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+		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));
 		}
 
 		return true;