X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=4022f999db3c04a87b7130e3d358dca6e2a0a1db;hb=8eeb7807d3cf7c0490299b7540ca06f4d091217c;hp=dbe6f108776986528d25d1561bef238a5eacc301;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index dbe6f10877..4022f999db 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -1,94 +1,130 @@ . + * */ use Friendica\App; use Friendica\Content\Text\BBCode; -use Friendica\Core\L10n; -use Friendica\Core\System; -use Friendica\Database\DBM; +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()) { - 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_id = (x($_POST,'item') ? intval($_POST['item']) : 0); - - $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); - if (!DBM::is_result($item)) { - goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); + $tags = []; + foreach ($_POST['tag'] ?? [] as $tag) { + $tags[] = hex2bin(Strings::escapeTags(trim($tag))); } - $arr = explode(',', $item['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_id]); - - 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; + } + 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 } + 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) { - goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); + DI::baseUrl()->redirect($_SESSION['photo_return']); // NOTREACHED } - $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); - if (!DBM::is_result($item)) { - 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(',', $item['tag']); + $tag_text = Tag::getCSVByURIId($item['uri-id']); + + $arr = explode(',', $tag_text); - if (!count($arr)) { - goaway(System::baseUrl() . '/' . $_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;