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)
{
$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']);
}
$tags = [];
- if (defaults($_POST, 'tag', '')){
- foreach ($_POST['tag'] as $t){
- array_push($tags, hex2bin(notags(trim($t))));
- }
+ 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 );
+ info(L10n::t('Tag(s) removed') . EOL);
$a->internalRedirect($_SESSION['photo_return']);
-
// NOTREACHED
}
*/
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)
// NOTREACHED
}
- if ($a->argc == 3){
- update_tags($a->argv[1], [hex2bin(notags(trim($a->argv[2])))]);
+ if ($a->argc == 3) {
+ update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]);
$a->internalRedirect($_SESSION['photo_return']);
}