Browse Source

Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags

pull/6003/head
Jonny Tischbein 3 years ago
parent
commit
fd2e06781d
5 changed files with 81 additions and 28 deletions
  1. +7
    -9
      mod/photos.php
  2. +40
    -11
      mod/tagrm.php
  3. +9
    -5
      src/Model/Item.php
  4. +15
    -0
      src/Model/Term.php
  5. +10
    -3
      view/theme/frio/templates/photo_view.tpl

+ 7
- 9
mod/photos.php View File

@ -612,7 +612,7 @@ function photos_post(App $a)
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
$str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
$str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
}
}
}
@ -1417,17 +1417,15 @@ function photos_content(App $a)
if (count($linked_items) && strlen($link_item['tag'])) {
$arr = explode(',', $link_item['tag']);
// parse tags and add links
$tag_str = '';
$tag_arr = [];
foreach ($arr as $t) {
if (strlen($tag_str)) {
$tag_str .= ', ';
}
$tag_str .= BBCode::convert($t);
array_push($tag_arr, ['name' => BBCode::convert($t),
'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($t)]);
}
$tags = [L10n::t('Tags: '), $tag_str];
$tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
if ($cmd === 'edit') {
$tags[] = 'tagrm/' . $link_item['id'];
$tags[] = L10n::t('[Remove any tag]');
$tags += ['removeanyurl' => 'tagrm/' . $link_item['id']];
$tags += ['removetitle' => L10n::t('[Remove any tag]')];
}
}


+ 40
- 11
mod/tagrm.php View File

@ -20,8 +20,27 @@ function tagrm_post(App $a)
$a->internalRedirect($_SESSION['photo_return']);
}
$tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : '');
$item_id = (x($_POST,'item') ? intval($_POST['item']) : 0);
$tags = [];
if (defaults($_POST, 'tag', '')){
foreach ($_POST['tag'] as $t){
array_push($tags, hex2bin(notags(trim($t))));
}
}
$item_id = defaults($_POST,'item', 0);
update_tags($item_id, $tags);
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']);
}
$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
if (!DBA::isResult($item)) {
@ -29,25 +48,29 @@ function tagrm_post(App $a)
}
$arr = explode(',', $item['tag']);
for ($x = 0; $x < count($arr); $x ++) {
if ($arr[$x] === $tag) {
unset($arr[$x]);
break;
foreach ($tags as $t) {
foreach ($arr as $i => $x) {
if (strcmp($x, $t) == 0) {
unset($arr[$i]);
break;
}
}
}
$tag_str = implode(',',$arr);
if(empty($tag_str)){
$tag_str = '';
}
Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag removed') . EOL );
info(L10n::t('Tag(s) removed') . EOL );
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
function tagrm_content(App $a)
{
$o = '';
@ -57,6 +80,11 @@ function tagrm_content(App $a)
// NOTREACHED
}
if ($a->argc == 3){
update_tags($a->argv[1], [hex2bin(notags(trim($a->argv[2])))]);
goaway('/' . $_SESSION['photo_return']);
}
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$item_id) {
$a->internalRedirect($_SESSION['photo_return']);
@ -70,7 +98,8 @@ function tagrm_content(App $a)
$arr = explode(',', $item['tag']);
if (!count($arr)) {
if (empty($item['tag'])) {
$a->internalRedirect($_SESSION['photo_return']);
}
@ -83,7 +112,7 @@ function tagrm_content(App $a)
$o .= '<ul>';
foreach ($arr as $x) {
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
$o .= '<li><input type="checkbox" name="tag[]" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
}
$o .= '</ul>';


+ 9
- 5
src/Model/Item.php View File

@ -816,7 +816,7 @@ class Item extends BaseObject
$tags = $fields['tag'];
$fields['tag'] = null;
} else {
$tags = '';
$tags = null;
}
if (array_key_exists('file', $fields)) {
@ -895,10 +895,14 @@ class Item extends BaseObject
}
}
if (!empty($tags)) {
Term::insertFromTagFieldByItemId($item['id'], $tags);
if (!empty($item['tag'])) {
DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
if (!is_null($tags)) {
Term::deleteAllTags($item['id']);
if ($tags) {
Term::insertFromTagFieldByItemId($item['id'], $tags);
if (!empty($item['tag'])) {
DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
}
}
}


+ 15
- 0
src/Model/Term.php View File

@ -290,4 +290,19 @@ class Term
return $return;
}
/*
* Deletes all Tags from an item
*/
public static function deleteAllTags($itemid)
{
$message = Item::selectFirst(['id'], ['id' => $itemid]);
if (!DBA::isResult($message)) {
return;
}
// Clean up all tags
DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
}
}

+ 10
- 3
view/theme/frio/templates/photo_view.tpl View File

@ -51,12 +51,19 @@
{{* Tags and mentions *}}
{{if $tags}}
<div id="photo-tags">{{$tags.1}}</div>
<div id="photo-tags">{{$tags.title}}
{{foreach $tags.tags as $t}}
<span class="category label btn-success sm">
<span class="p-category">{{$t.name}}</span>
{{if $t.removeurl}} (<a href="{{$t.removeurl}}">x</a>) {{/if}}
</span>
{{/foreach}}
</div>
{{/if}}
{{if $tags.2}}
{{if $tags.removeanyurl}}
<div id="tag-remove">
<a href="{{$tags.2}}">{{$tags.3}}</a>
<a href="{{$tags.removeanyurl}}">{{$tags.removetitle}}</a>
</div>
{{/if}}


Loading…
Cancel
Save