Ops, one more left ...

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 1e6c53e17520a440dee48843ab40e4422bb96671..a9dfc73f4e1f0f97e898da67e29581ce4144508f 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -18,40 +18,39 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
-require_once 'include/bbcode.php';
 require_once 'include/items.php';
 
 function poke_init(App $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);
+       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0);
 
 
        logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
@@ -62,50 +61,45 @@ function poke_init(App $a) {
                intval($uid)
        );
 
-       if (! DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                logger('poke: no contact ' . $contact_id);
                return;
        }
 
        $target = $r[0];
 
-       if($parent) {
-               $r = q("SELECT `uri`, `private`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`
-                       FROM `item` WHERE `id` = %d AND `parent` = %d AND `uid` = %d LIMIT 1",
-                       intval($parent),
-                       intval($parent),
-                       intval($uid)
-               );
-               if (DBM::is_result($r)) {
-                       $parent_uri = $r[0]['uri'];
-                       $private    = $r[0]['private'];
-                       $allow_cid  = $r[0]['allow_cid'];
-                       $allow_gid  = $r[0]['allow_gid'];
-                       $deny_cid   = $r[0]['deny_cid'];
-                       $deny_gid   = $r[0]['deny_gid'];
+       if ($parent) {
+               $fields = ['uri', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+               $condition = ['id' => $parent, 'parent' => $parent, 'uid' => $uid];
+               $item = Item::selectFirst($fields, $condition);
+
+               if (DBA::isResult($item)) {
+                       $parent_uri = $item['uri'];
+                       $private    = $item['private'];
+                       $allow_cid  = $item['allow_cid'];
+                       $allow_gid  = $item['allow_gid'];
+                       $deny_cid   = $item['deny_cid'];
+                       $deny_gid   = $item['deny_gid'];
                }
-       }
-       else {
-
-               $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+       } else {
+               $private = (x($_GET,'private') ? intval($_GET['private']) : 0);
 
-               $allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
-               $allow_gid     = (($private) ? '' : $a->user['allow_gid']);
-               $deny_cid      = (($private) ? '' : $a->user['deny_cid']);
-               $deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+               $allow_cid     = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+               $allow_gid     = ($private ? '' : $a->user['allow_gid']);
+               $deny_cid      = ($private ? '' : $a->user['deny_cid']);
+               $deny_gid      = ($private ? '' : $a->user['deny_gid']);
        }
 
        $poster = $a->contact;
 
-       $uri = item_new_uri($a->get_hostname(),$uid);
+       $uri = Item::newURI($uid);
 
        $arr = [];
 
-       $arr['guid']          = get_guid(32);
+       $arr['guid']          = System::createGUID(32);
        $arr['uid']           = $uid;
        $arr['uri']           = $uri;
-       $arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
-       $arr['type']          = 'activity';
+       $arr['parent-uri']    = ($parent_uri ? $parent_uri : $uri);
        $arr['wall']          = 1;
        $arr['contact-id']    = $poster['id'];
        $arr['owner-name']    = $poster['name'];
@@ -134,15 +128,12 @@ function poke_init(App $a) {
        $arr['object'] .= '</link></object>' . "\n";
 
        $item_id = Item::insert($arr);
-       if($item_id) {
+       if ($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;
 }
 
@@ -150,7 +141,7 @@ function poke_init(App $a) {
 
 function poke_content(App $a) {
 
-       if (! local_user()) {
+       if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
@@ -158,14 +149,14 @@ function poke_content(App $a) {
        $name = '';
        $id = '';
 
-       if(intval($_GET['c'])) {
+       if (intval($_GET['c'])) {
                $r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($_GET['c']),
                        intval(local_user())
                );
-               if (DBM::is_result($r)) {
-                       $name = $r[0]['name'];
-                       $id = $r[0]['id'];
+               if (DBA::isResult($r)) {
+                       $name = $item['name'];
+                       $id = $item['id'];
                }
        }
 
@@ -179,16 +170,17 @@ function poke_content(App $a) {
        ]);
 
 
-       $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0');
 
 
        $verbs = get_poke_verbs();
 
        $shortlist = [];
-       foreach($verbs as $k => $v)
-               if($v[1] !== 'NOTRANSLATION')
-                       $shortlist[] = [$k,$v[1]];
-
+       foreach ($verbs as $k => $v) {
+               if ($v[1] !== 'NOTRANSLATION') {
+                       $shortlist[] = [$k, $v[1]];
+               }
+       }
 
        $tpl = get_markup_template('poke_content.tpl');
 
@@ -206,5 +198,4 @@ function poke_content(App $a) {
        ]);
 
        return $o;
-
 }