consistent use of terms in heading in the admin panel

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 2f989dd7d3b07bd415847fe376034911b3be3ea9..3148896bc27a8fa624bd4732bdfdf692d9b8f324 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Poke, prod, finger, or otherwise do unspeakable things to somebody - who must be a connection in your address book
  * This function can be invoked with the required arguments (verb and cid and private and possibly parent) silently via ajax or
@@ -7,7 +6,7 @@
  * If the required arguments aren't present, we'll display a simple form to choose a recipient and a verb.
  * parent is a special argument which let's you attach this activity as a comment to an existing conversation, which
  * may have started with somebody else poking (etc.) somebody, but this isn't necessary. This can be used in the more pokes
- * plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
+ * addon version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
  *
  * private creates a private conversation with the recipient. Otherwise your profile's default post privacy is used.
  *
@@ -15,13 +14,15 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Addon;
+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');
+require_once 'include/security.php';
+require_once 'include/items.php';
 
 function poke_init(App $a) {
 
@@ -97,7 +98,7 @@ function poke_init(App $a) {
 
        $uri = item_new_uri($a->get_hostname(),$uid);
 
-       $arr = array();
+       $arr = [];
 
        $arr['guid']          = get_guid(32);
        $arr['uid']           = $uid;
@@ -117,14 +118,13 @@ function poke_init(App $a) {
        $arr['allow_gid']     = $allow_gid;
        $arr['deny_cid']      = $deny_cid;
        $arr['deny_gid']      = $deny_gid;
-       $arr['last-child']    = 1;
        $arr['visible']       = 1;
        $arr['verb']          = $activity;
        $arr['private']       = $private;
        $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,20 +132,12 @@ 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);
        }
 
-
-       call_hooks('post_local_end', $arr);
-
-       Worker::add(PRIORITY_HIGH, "Notifier", "like", $post_id);
+       Addon::callHooks('post_local_end', $arr);
 
        return;
 }
@@ -155,7 +147,7 @@ function poke_init(App $a) {
 function poke_content(App $a) {
 
        if (! local_user()) {
-               notice( t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
@@ -177,10 +169,10 @@ function poke_content(App $a) {
        $base = System::baseUrl();
 
        $head_tpl = get_markup_template('poke_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($head_tpl,array(
+       $a->page['htmlhead'] .= replace_macros($head_tpl,[
                '$baseurl' => System::baseUrl(true),
                '$base' => $base
-       ));
+       ]);
 
 
        $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
@@ -188,26 +180,26 @@ function poke_content(App $a) {
 
        $verbs = get_poke_verbs();
 
-       $shortlist = array();
+       $shortlist = [];
        foreach($verbs as $k => $v)
                if($v[1] !== 'NOTRANSLATION')
-                       $shortlist[] = array($k,$v[1]);
+                       $shortlist[] = [$k,$v[1]];
 
 
        $tpl = get_markup_template('poke_content.tpl');
 
-       $o = replace_macros($tpl,array(
-               '$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'),
+       $o = replace_macros($tpl,[
+               '$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
-       ));
+       ]);
 
        return $o;