admin users, don't set account-type if page flag isn't PAGE_NORMAL

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index bff3ebdf2c1ec3dca50acd5ffe0c2f94dee9b76a..3148896bc27a8fa624bd4732bdfdf692d9b8f324 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -19,9 +19,9 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
 require_once 'include/security.php';
-require_once 'include/bbcode.php';
 require_once 'include/items.php';
 
 function poke_init(App $a) {
@@ -124,7 +124,7 @@ function poke_init(App $a) {
        $arr['object-type']   = ACTIVITY_OBJ_PERSON;
 
        $arr['origin']        = 1;
-       $arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+       $arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
        $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
        $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
@@ -132,21 +132,13 @@ function poke_init(App $a) {
        $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
        $arr['object'] .= '</link></object>' . "\n";
 
-       $item_id = item_store($arr);
+       $item_id = Item::insert($arr);
        if($item_id) {
-               //q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-               //      dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
-               //      intval($uid),
-               //      intval($item_id)
-               //);
                Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
        }
 
-
        Addon::callHooks('post_local_end', $arr);
 
-       Worker::add(PRIORITY_HIGH, "Notifier", "like", $post_id);
-
        return;
 }
 
@@ -197,14 +189,14 @@ function poke_content(App $a) {
        $tpl = get_markup_template('poke_content.tpl');
 
        $o = replace_macros($tpl,[
-               '$title' => t('Poke/Prod'),
-               '$desc' => t('poke, prod or do other things to somebody'),
-               '$clabel' => t('Recipient'),
-               '$choice' => t('Choose what you wish to do to recipient'),
+               '$title' => L10n::t('Poke/Prod'),
+               '$desc' => L10n::t('poke, prod or do other things to somebody'),
+               '$clabel' => L10n::t('Recipient'),
+               '$choice' => L10n::t('Choose what you wish to do to recipient'),
                '$verbs' => $shortlist,
                '$parent' => $parent,
-               '$prv_desc' => t('Make this post private'),
-               '$submit' => t('Submit'),
+               '$prv_desc' => L10n::t('Make this post private'),
+               '$submit' => L10n::t('Submit'),
                '$name' => $name,
                '$id' => $id
        ]);