X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Ftagrm.php;h=db0b765799ba7ab9582e9e1b9b4ac2cf9f450be3;hb=f85af78097d2ab73a9ee4b020a6a366f3a147de3;hp=fbbf3a7bbcec22404421514c9117a6c6f0944593;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git diff --git a/mod/tagrm.php b/mod/tagrm.php index fbbf3a7bbc..db0b765799 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -2,36 +2,33 @@ /** * @file mod/tagrm.php */ + use Friendica\App; +use Friendica\Content\Text\BBCode; use Friendica\Core\L10n; use Friendica\Core\System; -use Friendica\Database\DBM; - -require_once 'include/bbcode.php'; +use Friendica\Database\DBA; +use Friendica\Model\Item; -function tagrm_post(App $a) { - - if (! local_user()) { +function tagrm_post(App $a) +{ + if (!local_user()) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) { + if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $tag = ((x($_POST,'tag')) ? hex2bin(notags(trim($_POST['tag']))) : ''); - $item = ((x($_POST,'item')) ? intval($_POST['item']) : 0 ); - - $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)) { + $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); + if (!DBA::isResult($item)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $arr = explode(',', $r[0]['tag']); + $arr = explode(',', $item['tag']); for ($x = 0; $x < count($arr); $x ++) { if ($arr[$x] === $tag) { unset($arr[$x]); @@ -41,48 +38,39 @@ function tagrm_post(App $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(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()) { + if (!local_user()) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); // NOTREACHED } - $item = (($a->argc > 1) ? intval($a->argv[1]) : 0); - if (! $item) { + $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + if (!$item_id) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); // NOTREACHED } - $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item), - intval(local_user()) - ); - - if (! DBM::is_result($r)) { + $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); + if (!DBA::isResult($item)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $arr = explode(',', $r[0]['tag']); + $arr = explode(',', $item['tag']); - if (! count($arr)) { + if (!count($arr)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } @@ -91,11 +79,11 @@ function tagrm_content(App $a) { $o .= '
' . L10n::t('Select a tag to remove: ') . '
'; $o .= ''; return $o; - }