X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagrm.php;h=f6f2a9a29ebe99a614e07100ec494c8012a03588;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=105cc0b3d55467b867a5f8b1a3081b4cd698fcba;hpb=dbe49a0c1ad0467c2e12e363aac5635a1f11a3ea;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index 105cc0b3d5..f6f2a9a29e 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -6,9 +6,10 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\L10n; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Item; +use Friendica\Model\Term; +use Friendica\Util\Strings; function tagrm_post(App $a) { @@ -16,38 +17,55 @@ function tagrm_post(App $a) $a->internalRedirect($_SESSION['photo_return']); } - if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) { + if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) { $a->internalRedirect($_SESSION['photo_return']); } - $tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : ''); - $item_id = (x($_POST,'item') ? intval($_POST['item']) : 0); + $tags = []; + foreach (defaults($_POST, 'tag', []) as $tag) { + $tags[] = hex2bin(Strings::escapeTags(trim($tag))); + } + + $item_id = defaults($_POST,'item', 0); + update_tags($item_id, $tags); + info(L10n::t('Tag(s) removed') . EOL); + + $a->internalRedirect($_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(['tag'], ['id' => $item_id, 'uid' => local_user()]); if (!DBA::isResult($item)) { - $a->internalRedirect($_SESSION['photo_return']); + return; } - $arr = explode(',', $item['tag']); - for ($x = 0; $x < count($arr); $x ++) { - if ($arr[$x] === $tag) { - unset($arr[$x]); - break; + $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; + } } } - $tag_str = implode(',',$arr); - - Item::update(['tag' => $tag_str], ['id' => $item_id]); - - info(L10n::t('Tag removed') . EOL ); - $a->internalRedirect($_SESSION['photo_return']); - - // NOTREACHED + $tag_str = implode(',', $old_tags); + Term::insertFromTagFieldByItemId($item_id, $tag_str); } - - function tagrm_content(App $a) { $o = ''; @@ -57,6 +75,11 @@ function tagrm_content(App $a) // NOTREACHED } + if ($a->argc == 3) { + update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]); + $a->internalRedirect($_SESSION['photo_return']); + } + $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); if (!$item_id) { $a->internalRedirect($_SESSION['photo_return']); @@ -70,7 +93,8 @@ function tagrm_content(App $a) $arr = explode(',', $item['tag']); - if (!count($arr)) { + + if (empty($item['tag'])) { $a->internalRedirect($_SESSION['photo_return']); } @@ -83,7 +107,7 @@ function tagrm_content(App $a) $o .= '