Merge pull request #4328 from tobiasd/20180125-msg

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 2a9a26e37bfd4ead658a459076ae082abfa8f4c9..fbbf3a7bbcec22404421514c9117a6c6f0944593 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,15 +1,22 @@
 <?php
+/**
+ * @file mod/tagrm.php
+ */
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once('include/bbcode.php');
+require_once 'include/bbcode.php';
 
-function tagrm_post(App &$a) {
+function tagrm_post(App $a) {
 
        if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               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 +27,8 @@ function tagrm_post(App &$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']);
@@ -40,27 +47,27 @@ function tagrm_post(App &$a) {
                intval(local_user())
        );
 
-       info( t('Tag removed') . EOL );
-       goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
-       
+       info(L10n::t('Tag removed') . EOL );
+       goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+
        // NOTREACHED
 
 }
 
 
 
-function tagrm_content(App &$a) {
+function tagrm_content(App $a) {
 
        $o = '';
 
        if (! local_user()) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+               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']);
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
@@ -69,19 +76,19 @@ function tagrm_content(App &$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']);
+               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 . '" />';
@@ -92,8 +99,8 @@ function tagrm_content(App &$a) {
        }
 
        $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;