Move Module\Profile to Module\Profile\Index

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index a5288eaf99b2715f204a09db48b6e6c7e9e5f03c..aae4f9ed33d2d733c795e2710448e30595fbf8b5 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -5,72 +5,65 @@
 
 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'] === DI::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(DI::l10n()->t('Tag(s) removed') . EOL);
 
-       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)){
-               $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)
@@ -78,36 +71,36 @@ 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>';
+       $o .= '<h3>' . DI::l10n()->t('Remove Item Tag') . '</h3>';
 
-       $o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
+       $o .= '<p id="tag-remove-desc">' . DI::l10n()->t('Select a tag to remove: ') . '</p>';
 
        $o .= '<form id="tagrm" action="tagrm" method="post" >';
        $o .= '<input type="hidden" name="item" value="' . $item_id . '" />';
@@ -118,8 +111,8 @@ function tagrm_content(App $a)
        }
 
        $o .= '</ul>';
-       $o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . L10n::t('Remove') .'" />';
-       $o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . L10n::t('Cancel') .'" />';
+       $o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . DI::l10n()->t('Remove') .'" />';
+       $o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . DI::l10n()->t('Cancel') .'" />';
        $o .= '</form>';
 
        return $o;