X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=4022f999db3c04a87b7130e3d358dca6e2a0a1db;hb=8eeb7807d3cf7c0490299b7540ca06f4d091217c;hp=4bdaeb32f12b6e7272218e13110b2e15f9f9a434;hpb=272eb5eb820a03aff7bcb4e461e69c93d6dffab0;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index 4bdaeb32f1..4022f999db 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -1,79 +1,80 @@ . + * */ 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\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 = []; - if (defaults($_POST, 'tag', '')){ - foreach ($_POST['tag'] as $t){ - array_push($tags, hex2bin(notags(trim($t)))); - } + 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); - info(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)){ - $a->internalRedirect($_SESSION['photo_return']); +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)) { - $a->internalRedirect($_SESSION['photo_return']); + return; } - $arr = explode(',', $item['tag']); - - foreach ($tags as $t) { - foreach ($arr as $i => $x) { - if (strcmp($x, $t) == 0) { - unset($arr[$i]); - break; + 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]); } } } - - $tag_str = implode(',',$arr); - if(empty($tag_str)){ - $tag_str = ''; - } - - Item::update(['tag' => $tag_str], ['id' => $item_id]); - - info(L10n::t('Tag(s) removed') . EOL ); - $a->internalRedirect($_SESSION['photo_return']); - - // NOTREACHED } function tagrm_content(App $a) @@ -81,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 .= '
' . L10n::t('Select a tag to remove: ') . '
'; + $o .= '' . DI::l10n()->t('Select a tag to remove: ') . '
'; $o .= ''; return $o;