X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=4022f999db3c04a87b7130e3d358dca6e2a0a1db;hb=3d55ef15467074fbf98fdf2217dc242c8a091ffc;hp=2a829932ea1fe07d6225d2b97a81443d01eec43c;hpb=b0fe83216d6247511ea9d27cf1d66a3264cb7303;p=friendica.git

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 2a829932ea..4022f999db 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,104 +1,131 @@
 <?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\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Content\Text\BBCode;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Tag;
+use Friendica\Util\Strings;
 
-require_once 'include/bbcode.php';
-
-function tagrm_post(App $a) {
-
+function tagrm_post(App $a)
+{
 	if (!local_user()) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	if (!empty($_POST['submit']) && ($_POST['submit'] === DI::l10n()->t('Cancel'))) {
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	$tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
-	$item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
-
-	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval(local_user())
-	);
-
-	if (!DBM::is_result($r)) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	$tags = [];
+	foreach ($_POST['tag'] ?? [] as $tag) {
+		$tags[] = hex2bin(Strings::escapeTags(trim($tag)));
 	}
 
-	$arr = explode(',', $r[0]['tag']);
-	for ($x = 0; $x < count($arr); $x ++) {
-		if ($arr[$x] === $tag) {
-			unset($arr[$x]);
-			break;
-		}
-	}
-
-	$tag_str = implode(',',$arr);
-
-	Item::update(['tag' => $tag_str], ['id' => $item]);
-
-	info(L10n::t('Tag removed') . EOL );
-	goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	$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
 }
 
+/**
+ * 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)) {
+		return;
+	}
 
+	$item = Item::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
+	if (!DBA::isResult($item)) {
+		return;
+	}
 
-function tagrm_content(App $a) {
+	foreach ($tags as $new_tag) {
+		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]);
+			}
+		}
+	}
+}
 
+function tagrm_content(App $a)
+{
 	$o = '';
 
 	if (!local_user()) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-	$item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-	if (!$item) {
-		goaway(System::baseUrl() . '/' . $_SESSION['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']);
 	}
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval(local_user())
-	);
+	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	if (!$item_id) {
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
+		// NOTREACHED
+	}
 
-	if (!DBM::is_result($r)) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	$item = Item::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
+	if (!DBA::isResult($item)) {
+		DI::baseUrl()->redirect($_SESSION['photo_return']);
 	}
 
-	$arr = explode(',', $r[0]['tag']);
+	$tag_text = Tag::getCSVByURIId($item['uri-id']);
 
-	if (!count($arr)) {
-		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+	$arr = explode(',', $tag_text);
+
+	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 . '" />';
+	$o .= '<input type="hidden" name="item" value="' . $item_id . '" />';
 	$o .= '<ul>';
 
 	foreach ($arr as $x) {
-		$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
+		$o .= '<li><input type="checkbox" name="tag[]" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
 	}
 
 	$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;
-
 }