Just some more fixed notice

[friendica.git] / mod / tagrm.php

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 57024b3c3b6f2127a20074849f1c8593cbddf251..dbe6f108776986528d25d1561bef238a5eacc301 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,30 +1,36 @@
 <?php
+/**
+ * @file mod/tagrm.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(App $a)
+{
+       if (!local_user()) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+       }
 
-require_once('include/bbcode.php');
-
-function tagrm_post(&$a) {
-
-       if(! local_user())
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-
-
-       if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-
-       $tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
-       $item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
+       if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+       }
 
-       $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($item),
-               intval(local_user())
-       );
+       $tag =  (x($_POST,'tag')  ? hex2bin(notags(trim($_POST['tag']))) : '');
+       $item_id = (x($_POST,'item') ? intval($_POST['item'])               : 0);
 
-       if(! dbm::is_result($r))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+       if (!DBM::is_result($item)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+       }
 
-       $arr = explode(',', $r[0]['tag']);
-       for($x = 0; $x < count($arr); $x ++) {
-               if($arr[$x] === $tag) {
+       $arr = explode(',', $item['tag']);
+       for ($x = 0; $x < count($arr); $x ++) {
+               if ($arr[$x] === $tag) {
                        unset($arr[$x]);
                        break;
                }
@@ -32,68 +38,58 @@ 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_id]);
 
-       info( t('Tag removed') . EOL );
-       goaway($a->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($a->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($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+       $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+       if (!$item_id) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
                // NOTREACHED
        }
 
+       $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+       if (!DBM::is_result($item)) {
+               goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
+       }
 
-       $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($item),
-               intval(local_user())
-       );
-
-       if(! dbm::is_result($r))
-               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-
-       $arr = explode(',', $r[0]['tag']);
+       $arr = explode(',', $item['tag']);
 
-       if(! count($arr))
-               goaway($a->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 .= '<input type="hidden" name="item" value="' . $item_id . '" />';
        $o .= '<ul>';
 
-
-       foreach($arr as $x) {
-               $o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
+       foreach ($arr as $x) {
+               $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;
-       
 }