More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 1af78b68edf2b85c6459ba7d9ec142f42e707ed2..af5dacabc153f220889834fe75fe9bf3cea4f029 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -4,11 +4,11 @@
  *
  * 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.
  *
@@ -18,7 +18,7 @@ require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 
-if(! function_exists('poke_init')) {
+
 function poke_init(&$a) {
 
        if(! local_user())
@@ -52,7 +52,7 @@ function poke_init(&$a) {
                intval($uid)
        );
 
-       if(! count($r)) {
+       if(! dbm::is_result($r)) {
                logger('poke: no contact ' . $contact_id);
                return;
        }
@@ -66,7 +66,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'];
@@ -91,6 +91,7 @@ function poke_init(&$a) {
 
        $arr = array();
 
+       $arr['guid']          = get_guid(32);
        $arr['uid']           = $uid;
        $arr['uri']           = $uri;
        $arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
@@ -130,19 +131,19 @@ function poke_init(&$a) {
                //      intval($uid),
                //      intval($item_id)
                //);
-               proc_run('php',"include/notifier.php","tag","$item_id");
+               proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
        }
 
 
        call_hooks('post_local_end', $arr);
 
-       proc_run('php',"include/notifier.php","like","$post_id");
+       proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
 
        return;
 }
-}
 
-if(! function_exists('poke_content')) {
+
+
 function poke_content(&$a) {
 
        if(! local_user()) {
@@ -158,7 +159,7 @@ 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'];
                }
@@ -201,5 +202,5 @@ function poke_content(&$a) {
        ));
 
        return $o;
-}
+
 }