X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=fdf3ef4f8f4cfee64f55056fd07651737c644c18;hb=989ac2fda800b826addbf70eff4feccde1c352ba;hp=aae4f9ed33d2d733c795e2710448e30595fbf8b5;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git

diff --git a/mod/tagrm.php b/mod/tagrm.php
index aae4f9ed33..fdf3ef4f8f 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,15 +1,30 @@
 <?php
 /**
- * @file mod/tagrm.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Item;
-use Friendica\Model\Term;
-use Friendica\Util\Strings;
+use Friendica\Model\Post;
+use Friendica\Model\Tag;
 
 function tagrm_post(App $a)
 {
@@ -23,12 +38,11 @@ function tagrm_post(App $a)
 
 	$tags = [];
 	foreach ($_POST['tag'] ?? [] as $tag) {
-		$tags[] = hex2bin(Strings::escapeTags(trim($tag)));
+		$tags[] = hex2bin(trim($tag));
 	}
 
 	$item_id = $_POST['item'] ?? 0;
 	update_tags($item_id, $tags);
-	info(DI::l10n()->t('Tag(s) removed') . EOL);
 
 	DI::baseUrl()->redirect($_SESSION['photo_return']);
 	// NOTREACHED
@@ -41,61 +55,59 @@ function tagrm_post(App $a)
  * @param $tags array
  * @throws Exception
  */
-function update_tags($item_id, $tags){
-	if (empty($item_id) || empty($tags)){
+function update_tags($item_id, $tags)
+{
+	if (empty($item_id) || empty($tags)) {
 		return;
 	}
 
-	$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+	$item = Post::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
 	if (!DBA::isResult($item)) {
 		return;
 	}
 
-	$old_tags = explode(',', $item['tag']);
-
 	foreach ($tags as $new_tag) {
-		foreach ($old_tags as $index => $old_tag) {
-			if (strcmp($old_tag, $new_tag) == 0) {
-				unset($old_tags[$index]);
-				break;
+		if (preg_match_all('/([#@!])\[url\=([^\[\]]*)\]([^\[\]]*)\[\/url\]/ism', $new_tag, $results, PREG_SET_ORDER)) {
+			foreach ($results as $tag) {
+				Tag::removeByHash($item['uri-id'], $tag[1], $tag[3], $tag[2]);
 			}
 		}
 	}
-
-	$tag_str = implode(',', $old_tags);
-	Term::insertFromTagFieldByItemId($item_id, $tag_str);
 }
 
 function tagrm_content(App $a)
 {
 	$o = '';
 
+	$photo_return = $_SESSION['photo_return'] ?? '';
+
 	if (!local_user()) {
-		DI::baseUrl()->redirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($photo_return);
 		// NOTREACHED
 	}
 
-	if ($a->argc == 3) {
-		update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]);
-		DI::baseUrl()->redirect($_SESSION['photo_return']);
+	if (DI::args()->getArgc()== 3) {
+		update_tags(DI::args()->getArgv()[1], [trim(hex2bin(DI::args()->getArgv()[2]))]);
+		DI::baseUrl()->redirect($photo_return);
 	}
 
-	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	$item_id = ((DI::args()->getArgc()> 1) ? intval(DI::args()->getArgv()[1]) : 0);
 	if (!$item_id) {
-		DI::baseUrl()->redirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($photo_return);
 		// NOTREACHED
 	}
 
-	$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+	$item = Post::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
 	if (!DBA::isResult($item)) {
-		DI::baseUrl()->redirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($photo_return);
 	}
 
-	$arr = explode(',', $item['tag']);
+	$tag_text = Tag::getCSVByURIId($item['uri-id']);
 
+	$arr = explode(',', $tag_text);
 
-	if (empty($item['tag'])) {
-		DI::baseUrl()->redirect($_SESSION['photo_return']);
+	if (empty($arr)) {
+		DI::baseUrl()->redirect($photo_return);
 	}
 
 	$o .= '<h3>' . DI::l10n()->t('Remove Item Tag') . '</h3>';