X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=e8ddf86cd3ad3abc4f527f2a7a0bcf19e440d046;hb=a11206dbcd662a73d1c8200f2bef5287533cdbe6;hp=e8c43213a799c536e2b92b7243739f2783d00c1a;hpb=dc669fa736daa2c666b6333c550ebd98083e5ca8;p=friendica.git diff --git a/mod/poke.php b/mod/poke.php index e8c43213a7..e8ddf86cd3 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -14,18 +14,16 @@ */ 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\Util\Strings; use Friendica\Util\XML; -require_once 'include/items.php'; - function poke_init(App $a) { if (!local_user()) { @@ -38,7 +36,7 @@ function poke_init(App $a) return; } - $verb = notags(trim($_GET['verb'])); + $verb = Strings::escapeTags(trim($_GET['verb'])); $verbs = L10n::getPokeVerbs(); @@ -53,7 +51,7 @@ function poke_init(App $a) 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 +83,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']); @@ -130,9 +128,9 @@ function poke_init(App $a) $arr['object'] .= XML::escape('' . "\n"); $arr['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 +142,6 @@ function poke_content(App $a) return; } - $name = ''; - $id = ''; - if (empty($_GET['c'])) { return; } @@ -159,16 +154,12 @@ 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 = L10n::getPokeVerbs();