Merge pull request #7988 from friendica/MrPetovan-notice

[friendica.git] / mod / poke.php

diff --git a/mod/poke.php b/mod/poke.php
index 60ed5c402e701ed42533f57aa460b2913444b0f8..69fd42c72cf1d19cfce6f0a3c3075f6278b2e6d2 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -14,18 +14,17 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function poke_init(App $a)
 {
        if (!local_user()) {
@@ -38,22 +37,22 @@ function poke_init(App $a)
                return;
        }
 
-       $verb = notags(trim($_GET['verb']));
+       $verb = Strings::escapeTags(trim($_GET['verb']));
 
-       $verbs = get_poke_verbs();
+       $verbs = L10n::getPokeVerbs();
 
        if (!array_key_exists($verb, $verbs)) {
                return;
        }
 
-       $activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
+       $activity = Activity::POKE . '#' . urlencode($verbs[$verb][0]);
 
        $contact_id = intval($_GET['cid']);
        if (!$contact_id) {
                return;
        }
 
-       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0);
+       $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : 0);
 
 
        Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, Logger::DEBUG);
@@ -85,7 +84,7 @@ function poke_init(App $a)
                        $deny_gid   = $item['deny_gid'];
                }
        } else {
-               $private = (x($_GET,'private') ? intval($_GET['private']) : 0);
+               $private = (!empty($_GET['private']) ? intval($_GET['private']) : 0);
 
                $allow_cid     = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']);
                $allow_gid     = ($private ? '' : $a->user['allow_gid']);
@@ -119,20 +118,20 @@ function poke_init(App $a)
        $arr['visible']       = 1;
        $arr['verb']          = $activity;
        $arr['private']       = $private;
-       $arr['object-type']   = ACTIVITY_OBJ_PERSON;
+       $arr['object-type']   = Activity\ObjectType::PERSON;
 
        $arr['origin']        = 1;
        $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>' . $target['url'] . '</id>';
+       $arr['object'] = '<object><type>' . Activity\ObjectType::PERSON . '</type><title>' . $target['name'] . '</title><id>' . $target['url'] . '</id>';
        $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
 
        $arr['object'] .= XML::escape('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
        $arr['object'] .= '</link></object>' . "\n";
 
-       $item_id = Item::insert($arr);
+       Item::insert($arr);
 
-       Addon::callHooks('post_local_end', $arr);
+       Hook::callAll('post_local_end', $arr);
 
        return;
 }
@@ -144,9 +143,6 @@ function poke_content(App $a)
                return;
        }
 
-       $name = '';
-       $id = '';
-
        if (empty($_GET['c'])) {
                return;
        }
@@ -159,19 +155,15 @@ function poke_content(App $a)
        $name = $contact['name'];
        $id = $contact['id'];
 
-       $base = System::baseUrl();
-
        $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl');
        $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl,[
                '$baseurl' => System::baseUrl(true),
-               '$base' => $base
        ]);
 
-
-       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0');
+       $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0');
 
 
-       $verbs = get_poke_verbs();
+       $verbs = L10n::getPokeVerbs();
 
        $shortlist = [];
        foreach ($verbs as $k => $v) {