Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 1683bf1d6f4df22e3ec8cc8b8481923fa732d07a..267ee718cc04280ab01a5e163dbf8ba42c7cdeab 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -6,38 +6,41 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
+use Friendica\Util\Strings;
 
 function tagrm_post(App $a)
 {
        if (!local_user()) {
-               $a->internalRedirect($_SESSION['photo_return']);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
        }
 
-       if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
-               $a->internalRedirect($_SESSION['photo_return']);
+       if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) {
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
        }
 
        $tags = [];
-       foreach (defaults($_POST, 'tag', []) as $tag) {
-               array_push($tags, hex2bin(notags(trim($tag))));
+       foreach ($_POST['tag'] ?? [] as $tag) {
+               $tags[] = hex2bin(Strings::escapeTags(trim($tag)));
        }
 
-       $item_id = defaults($_POST,'item', 0);
+       $item_id = $_POST['item'] ?? 0;
        update_tags($item_id, $tags);
+       info(L10n::t('Tag(s) removed') . EOL);
 
-       $a->internalRedirect($_SESSION['photo_return']);
-
+       DI::baseUrl()->redirect($_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)){
@@ -52,18 +55,16 @@ function update_tags($item_id, $tags){
        $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);
+       $tag_str = implode(',', $old_tags);
        Term::insertFromTagFieldByItemId($item_id, $tag_str);
-
-       info(L10n::t('Tag(s) removed') . EOL );
 }
 
 function tagrm_content(App $a)
@@ -71,31 +72,31 @@ function tagrm_content(App $a)
        $o = '';
 
        if (!local_user()) {
-               $a->internalRedirect($_SESSION['photo_return']);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
                // NOTREACHED
        }
 
-       if ($a->argc == 3){
-               update_tags($a->argv[1], [hex2bin(notags(trim($a->argv[2])))]);
-               $a->internalRedirect($_SESSION['photo_return']);
+       if ($a->argc == 3) {
+               update_tags($a->argv[1], [Strings::escapeTags(trim(hex2bin($a->argv[2])))]);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
        }
 
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
        if (!$item_id) {
-               $a->internalRedirect($_SESSION['photo_return']);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
                // NOTREACHED
        }
 
        $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
        if (!DBA::isResult($item)) {
-               $a->internalRedirect($_SESSION['photo_return']);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
        }
 
        $arr = explode(',', $item['tag']);
 
 
        if (empty($item['tag'])) {
-               $a->internalRedirect($_SESSION['photo_return']);
+               DI::baseUrl()->redirect($_SESSION['photo_return']);
        }
 
        $o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';