X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=4022f999db3c04a87b7130e3d358dca6e2a0a1db;hb=de19f94aca20b4c99f5b2e4fdaf933ea03429609;hp=267ee718cc04280ab01a5e163dbf8ba42c7cdeab;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index 267ee718cc..4022f999db 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -1,15 +1,30 @@ . + * */ use Friendica\App; use Friendica\Content\Text\BBCode; -use Friendica\Core\L10n; 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) @@ -18,7 +33,7 @@ function tagrm_post(App $a) DI::baseUrl()->redirect($_SESSION['photo_return']); } - if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) { + if (!empty($_POST['submit']) && ($_POST['submit'] === DI::l10n()->t('Cancel'))) { DI::baseUrl()->redirect($_SESSION['photo_return']); } @@ -29,7 +44,7 @@ function tagrm_post(App $a) $item_id = $_POST['item'] ?? 0; update_tags($item_id, $tags); - info(L10n::t('Tag(s) removed') . EOL); + info(DI::l10n()->t('Tag(s) removed') . EOL); DI::baseUrl()->redirect($_SESSION['photo_return']); // NOTREACHED @@ -42,29 +57,24 @@ 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 = 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 $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) @@ -87,21 +97,22 @@ function tagrm_content(App $a) // 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)) { 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'])) { + if (empty($arr)) { DI::baseUrl()->redirect($_SESSION['photo_return']); } - $o .= '
' . L10n::t('Select a tag to remove: ') . '
'; + $o .= '' . DI::l10n()->t('Select a tag to remove: ') . '
'; $o .= ''; return $o;