Merge remote-tracking branch 'upstream/develop' into item-permissions

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 83f3bf1c735894fcfd37b058f45975387ad55e09..48eeec85a2df7419b195440268a36bc6bbce74bd 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -7,7 +7,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,6 +15,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -57,7 +61,7 @@ function poke_init(App $a) {
                intval($uid)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('poke: no contact ' . $contact_id);
                return;
        }
@@ -71,7 +75,7 @@ function poke_init(App $a) {
                        intval($parent),
                        intval($uid)
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $parent_uri = $r[0]['uri'];
                        $private    = $r[0]['private'];
                        $allow_cid  = $r[0]['allow_cid'];
@@ -94,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;
@@ -114,7 +118,6 @@ 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;
@@ -123,7 +126,7 @@ function poke_init(App $a) {
        $arr['origin']        = 1;
        $arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
-       $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . App::get_baseurl() . '/contact/' . $target['id'] . '</id>';
+       $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");
 
        $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
@@ -132,17 +135,17 @@ function poke_init(App $a) {
        $item_id = item_store($arr);
        if($item_id) {
                //q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-               //      dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+               //      dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
                //      intval($uid),
                //      intval($item_id)
                //);
-               proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+               Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
        }
 
 
-       call_hooks('post_local_end', $arr);
+       Addon::callHooks('post_local_end', $arr);
 
-       proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
+       Worker::add(PRIORITY_HIGH, "Notifier", "like", $post_id);
 
        return;
 }
@@ -164,20 +167,20 @@ function poke_content(App $a) {
                        intval($_GET['c']),
                        intval(local_user())
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $name = $r[0]['name'];
                        $id = $r[0]['id'];
                }
        }
 
 
-       $base = App::get_baseurl();
+       $base = System::baseUrl();
 
        $head_tpl = get_markup_template('poke_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($head_tpl,array(
-               '$baseurl' => App::get_baseurl(true),
+       $a->page['htmlhead'] .= replace_macros($head_tpl,[
+               '$baseurl' => System::baseUrl(true),
                '$base' => $base
-       ));
+       ]);
 
 
        $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
@@ -185,15 +188,15 @@ 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(
+       $o = replace_macros($tpl,[
                '$title' => t('Poke/Prod'),
                '$desc' => t('poke, prod or do other things to somebody'),
                '$clabel' => t('Recipient'),
@@ -204,7 +207,7 @@ function poke_content(App $a) {
                '$submit' => t('Submit'),
                '$name' => $name,
                '$id' => $id
-       ));
+       ]);
 
        return $o;