Merge pull request #1 from friendica/develop

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 2fa75133ca44681366ec12df9b0fea3bfe3fbf97..179276663b0fc5e60dba427ccae776c39d4d5d55 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -24,7 +24,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Util\Strings;
 
 function tagrm_post(App $a)
@@ -44,7 +44,6 @@ function tagrm_post(App $a)
 
        $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
@@ -57,29 +56,24 @@ function tagrm_post(App $a)
  * @param $tags array
  * @throws Exception
  */
-function update_tags($item_id, $tags){
-       if (empty($item_id) || empty($tags)){
+function update_tags($item_id, $tags)
+{
+       if (empty($item_id) || empty($tags)) {
                return;
        }
 
-       $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+       $item = Item::selectFirst(['uri-id'], ['id' => $item_id, 'uid' => local_user()]);
        if (!DBA::isResult($item)) {
                return;
        }
 
-       $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;
+               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]);
                        }
                }
        }
-
-       $tag_str = implode(',', $old_tags);
-       Term::insertFromTagFieldByItemId($item_id, $tag_str);
 }
 
 function tagrm_content(App $a)
@@ -102,15 +96,16 @@ function tagrm_content(App $a)
                // NOTREACHED
        }
 
-       $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+       $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 (empty($item['tag'])) {
+       if (empty($arr)) {
                DI::baseUrl()->redirect($_SESSION['photo_return']);
        }