proc_run was replaced

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 4a643435be229acda46beee3fe352af8ed3e830a..c02d59c460105498efb557eaf2b44d38503eec41 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -1,45 +1,52 @@
-<?php /** @file */
+<?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
- * other web request. You must be logged in and connected to a profile. 
+ * other web request. You must be logged in and connected to a profile.
  * 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.  
+ * plugin 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.
  *
+ * @file mod/poke.php
  */
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 
+function poke_init(App $a) {
 
-function poke_init(&$a) {
-
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        $uid = local_user();
        $verb = notags(trim($_GET['verb']));
 
-       if(! $verb)
+       if (! $verb) {
                return;
+       }
 
        $verbs = get_poke_verbs();
 
-       if(! array_key_exists($verb,$verbs))
+       if (! array_key_exists($verb,$verbs)) {
                return;
+       }
 
        $activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
 
        $contact_id = intval($_GET['cid']);
-       if(! $contact_id)
+       if (! $contact_id) {
                return;
+       }
 
        $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
@@ -52,7 +59,7 @@ function poke_init(&$a) {
                intval($uid)
        );
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                logger('poke: no contact ' . $contact_id);
                return;
        }
@@ -66,7 +73,7 @@ function poke_init(&$a) {
                        intval($parent),
                        intval($uid)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $parent_uri = $r[0]['uri'];
                        $private    = $r[0]['private'];
                        $allow_cid  = $r[0]['allow_cid'];
@@ -118,7 +125,7 @@ function poke_init(&$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>' . $a->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");
@@ -127,26 +134,26 @@ function poke_init(&$a) {
        $item_id = item_store($arr);
        if($item_id) {
                //q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-               //      dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+               //      dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
                //      intval($uid),
                //      intval($item_id)
                //);
-               proc_run('php',"include/notifier.php","tag","$item_id");
+               Worker::add(PRIORITY_HIGH, "notifier", "tag", $item_id);
        }
 
 
        call_hooks('post_local_end', $arr);
 
-       proc_run('php',"include/notifier.php","like","$post_id");
+       Worker::add(PRIORITY_HIGH, "notifier", "like", $post_id);
 
        return;
 }
 
 
 
-function poke_content(&$a) {
+function poke_content(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -159,18 +166,18 @@ function poke_content(&$a) {
                        intval($_GET['c']),
                        intval(local_user())
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $name = $r[0]['name'];
                        $id = $r[0]['id'];
                }
        }
 
 
-       $base = $a->get_baseurl();
+       $base = System::baseUrl();
 
        $head_tpl = get_markup_template('poke_head.tpl');
        $a->page['htmlhead'] .= replace_macros($head_tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => System::baseUrl(true),
                '$base' => $base
        ));