X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=267ee718cc04280ab01a5e163dbf8ba42c7cdeab;hb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;hp=a6745e8e560fed164f2714b75714cce240a54201;hpb=1689c440856e70687cabafda167cf9ee74fb3108;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index a6745e8e56..267ee718cc 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -6,69 +6,65 @@ 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\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'] === 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(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']); + return; } $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); if (!DBA::isResult($item)) { - $a->internalRedirect($_SESSION['photo_return']); + return; } - $arr = explode(',', $item['tag']); + $old_tags = explode(',', $item['tag']); - foreach ($tags as $t) { - foreach ($arr as $i => $x) { - if (strcmp($x, $t) == 0) { - unset($arr[$i]); + foreach ($tags as $new_tag) { + foreach ($old_tags as $index => $old_tag) { + if (strcmp($old_tag, $new_tag) == 0) { + unset($old_tags[$index]); break; } } } - $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 + $tag_str = implode(',', $old_tags); + Term::insertFromTagFieldByItemId($item_id, $tag_str); } function tagrm_content(App $a) @@ -76,31 +72,31 @@ 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()]); if (!DBA::isResult($item)) { - $a->internalRedirect($_SESSION['photo_return']); + DI::baseUrl()->redirect($_SESSION['photo_return']); } $arr = explode(',', $item['tag']); if (empty($item['tag'])) { - $a->internalRedirect($_SESSION['photo_return']); + DI::baseUrl()->redirect($_SESSION['photo_return']); } $o .= '