X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=4022f999db3c04a87b7130e3d358dca6e2a0a1db;hb=6a23f51549e6b476d494dce4131a24f8ebcdba43;hp=1683bf1d6f4df22e3ec8cc8b8481923fa732d07a;hpb=b03050c339fdc3384d9f2b8f900ed8bd9fd1d258;p=friendica.git

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 1683bf1d6f..4022f999db 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,69 +1,80 @@
 <?php
 /**
- * @file mod/tagrm.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/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
+use Friendica\Util\Strings;
 
 function tagrm_post(App $a)
 {
 	if (!local_user()) {
-		$a->internalRedirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
-		$a->internalRedirect($_SESSION['photo_return']);
+	if (!empty($_POST['submit']) && ($_POST['submit'] === DI::l10n()->t('Cancel'))) {
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
 	$tags = [];
-	foreach (defaults($_POST, 'tag', []) as $tag) {
-		array_push($tags, hex2bin(notags(trim($tag))));
+	foreach ($_POST['tag'] ?? [] as $tag) {
+		$tags[] = hex2bin(Strings::escapeTags(trim($tag)));
 	}
 
-	$item_id = defaults($_POST,'item', 0);
+	$item_id = $_POST['item'] ?? 0;
 	update_tags($item_id, $tags);
+	info(DI::l10n()->t('Tag(s) removed') . EOL);
 
-	$a->internalRedirect($_SESSION['photo_return']);
-
+	DI::baseUrl()->redirect($_SESSION['photo_return']);
 	// NOTREACHED
 }
 
 /**
  * Updates tags from an item
+ *
  * @param $item_id
  * @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 = Item::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 $count => $old_tag) {
-			if (strcmp($old_tag, $new_tag) == 0) {
-				unset($old_tags[$count]);
-				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);
-
-	info(L10n::t('Tag(s) removed') . EOL );
 }
 
 function tagrm_content(App $a)
@@ -71,36 +82,37 @@ function tagrm_content(App $a)
 	$o = '';
 
 	if (!local_user()) {
-		$a->internalRedirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-	if ($a->argc == 3){
-		update_tags($a->argv[1], [hex2bin(notags(trim($a->argv[2])))]);
-		$a->internalRedirect($_SESSION['photo_return']);
+	if ($a->argc == 3) {
+		update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
 	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 	if (!$item_id) {
-		$a->internalRedirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-	$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+	$item = Item::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
 	if (!DBA::isResult($item)) {
-		$a->internalRedirect($_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	$arr = explode(',', $item['tag']);
+	$tag_text = Tag::getCSVByURIId($item['uri-id']);
 
+	$arr = explode(',', $tag_text);
 
-	if (empty($item['tag'])) {
-		$a->internalRedirect($_SESSION['photo_return']);
+	if (empty($arr)) {
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	$o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';
+	$o .= '<h3>' . DI::l10n()->t('Remove Item Tag') . '</h3>';
 
-	$o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
+	$o .= '<p id="tag-remove-desc">' . DI::l10n()->t('Select a tag to remove: ') . '</p>';
 
 	$o .= '<form id="tagrm" action="tagrm" method="post" >';
 	$o .= '<input type="hidden" name="item" value="' . $item_id . '" />';
@@ -111,8 +123,8 @@ function tagrm_content(App $a)
 	}
 
 	$o .= '</ul>';
-	$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . L10n::t('Remove') .'" />';
-	$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . L10n::t('Cancel') .'" />';
+	$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . DI::l10n()->t('Remove') .'" />';
+	$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . DI::l10n()->t('Cancel') .'" />';
 	$o .= '</form>';
 
 	return $o;