Merge pull request #6226 from annando/oembed-array

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index a5288eaf99b2715f204a09db48b6e6c7e9e5f03c..24a41be95ce79a141b97545bb9693ec1476eaa0b 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -6,10 +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)
 {
@@ -17,22 +17,20 @@ 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 = [];
        foreach (defaults($_POST, 'tag', []) as $tag) {
-               array_push($tags, hex2bin(notags(trim($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
 }
 
@@ -43,34 +41,27 @@ function tagrm_post(App $a)
  */
 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;
        }
 
        $old_tags = explode(',', $item['tag']);
 
        foreach ($tags as $new_tag) {
-               foreach ($old_tags as $count => $old_tag) {
+               foreach ($old_tags as $index => $old_tag) {
                        if (strcmp($old_tag, $new_tag) == 0) {
-                               unset($old_tags[$count]);
+                               unset($old_tags[$index]);
                                break;
                        }
                }
        }
 
-       $tag_str = implode(',',$old_tags);
-       if(!empty($tag_str)) {
-               Item::update(['tag' => $tag_str], ['id' => $item_id]);
-       }
-       else {
-               Term::deleteByItemId($item_id);
-       }
-
-       info(L10n::t('Tag(s) removed') . EOL );
+       $tag_str = implode(',', $old_tags);
+       Term::insertFromTagFieldByItemId($item_id, $tag_str);
 }
 
 function tagrm_content(App $a)
@@ -82,8 +73,8 @@ 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']);
        }