Replace include/event function with method calls

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 7a18d65d0660802a0d13fc5e4261d04623c41b3f..b9991d68da5b5ff0ea4c9a7a360dfe2fe1464ed8 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,15 +1,23 @@
 <?php
+/**
+ * @file mod/tagrm.php
+ */
 
-require_once('include/bbcode.php');
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
-function tagrm_post(&$a) {
+function tagrm_post(App $a) {
 
-       if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!local_user()) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
-       if ((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel'))) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
@@ -20,8 +28,8 @@ function tagrm_post(&$a) {
                intval(local_user())
        );
 
-       if (! dbm::is_result($r)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!DBM::is_result($r)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $arr = explode(',', $r[0]['tag']);
@@ -34,33 +42,28 @@ function tagrm_post(&$a) {
 
        $tag_str = implode(',',$arr);
 
-       q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d AND `uid` = %d",
-               dbesc($tag_str),
-               intval($item),
-               intval(local_user())
-       );
+       Item::update(['tag' => $tag_str], ['id' => $item]);
 
-       info( t('Tag removed') . EOL );
-       goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
-       
-       // NOTREACHED
+       info(L10n::t('Tag removed') . EOL );
+       goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 
+       // NOTREACHED
 }
 
 
 
-function tagrm_content(&$a) {
+function tagrm_content(App $a) {
 
        $o = '';
 
-       if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!local_user()) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
        $item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-       if (! $item) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!$item) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
@@ -69,31 +72,31 @@ function tagrm_content(&$a) {
                intval(local_user())
        );
 
-       if (! dbm::is_result($r)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!DBM::is_result($r)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
        $arr = explode(',', $r[0]['tag']);
 
-       if (! count($arr)) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+       if (!count($arr)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
        }
 
-       $o .= '<h3>' . t('Remove Item Tag') . '</h3>';
+       $o .= '<h3>' . L10n::t('Remove Item Tag') . '</h3>';
 
-       $o .= '<p id="tag-remove-desc">' . t('Select a tag to remove: ') . '</p>';
+       $o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
 
        $o .= '<form id="tagrm" action="tagrm" method="post" >';
        $o .= '<input type="hidden" name="item" value="' . $item . '" />';
        $o .= '<ul>';
 
        foreach ($arr as $x) {
-               $o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
+               $o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
        }
 
        $o .= '</ul>';
-       $o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . t('Remove') .'" />';
-       $o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . t('Cancel') .'" />';
+       $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 .= '</form>';
 
        return $o;