X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=0034a2d87a50f966b269b57c317bcebc3ba14653;hb=8293d5ed0af78ae6cc5629bb1f982a7b29794d32;hp=470f1eb2d6bbe00a8afdcd892cbd00ad4812b374;hpb=7d1bb9ecf482874155695488ba54021ce0200f5c;p=friendica.git diff --git a/mod/poke.php b/mod/poke.php index 470f1eb2d6..0034a2d87a 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -14,46 +14,48 @@ */ use Friendica\App; -use Friendica\Core\Addon; -use Friendica\Core\L10n; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; +use Friendica\Protocol\Activity; +use Friendica\Util\Strings; +use Friendica\Util\XML; -require_once 'include/security.php'; -require_once 'include/items.php'; - -function poke_init(App $a) { - +function poke_init(App $a) +{ if (!local_user()) { return; } $uid = local_user(); - $verb = notags(trim($_GET['verb'])); - if (!$verb) { + if (empty($_GET['verb'])) { return; } - $verbs = get_poke_verbs(); + $verb = Strings::escapeTags(trim($_GET['verb'])); + + $verbs = DI::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('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG); + Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, Logger::DEBUG); $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -61,8 +63,8 @@ function poke_init(App $a) { intval($uid) ); - if (!DBM::is_result($r)) { - logger('poke: no contact ' . $contact_id); + if (!DBA::isResult($r)) { + Logger::log('poke: no contact ' . $contact_id); return; } @@ -71,9 +73,9 @@ function poke_init(App $a) { if ($parent) { $fields = ['uri', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']; $condition = ['id' => $parent, 'parent' => $parent, 'uid' => $uid]; - $item = Item::selectFirst(local_user(), $fields, $condition); + $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { $parent_uri = $item['uri']; $private = $item['private']; $allow_cid = $item['allow_cid']; @@ -82,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']); @@ -96,11 +98,10 @@ function poke_init(App $a) { $arr = []; - $arr['guid'] = get_guid(32); + $arr['guid'] = System::createUUID(); $arr['uid'] = $uid; $arr['uri'] = $uri; - $arr['parent-uri'] = ($parent_uri ? $parent_uri : $uri); - $arr['type'] = 'activity'; + $arr['parent-uri'] = (!empty($parent_uri) ? $parent_uri : $uri); $arr['wall'] = 1; $arr['contact-id'] = $poster['id']; $arr['owner-name'] = $poster['name']; @@ -117,64 +118,52 @@ 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['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . DI::l10n()->t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]'; - $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $target['name'] . '' . System::baseUrl() . '/contact/' . $target['id'] . ''; - $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] = '' . Activity\ObjectType::PERSON . '' . $target['name'] . '' . $target['url'] . ''; + $arr['object'] .= '' . XML::escape('' . "\n"); - $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= XML::escape('' . "\n"); $arr['object'] .= '' . "\n"; - $item_id = Item::insert($arr); - if ($item_id) { - Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id); - } + Item::insert($arr); - Addon::callHooks('post_local_end', $arr); + Hook::callAll('post_local_end', $arr); return; } - - -function poke_content(App $a) { - +function poke_content(App $a) +{ if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.') . EOL); return; } - $name = ''; - $id = ''; - - 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 = $item['name']; - $id = $item['id']; - } + if (empty($_GET['c'])) { + return; } + $contact = DBA::selectFirst('contact', ['id', 'name'], ['id' => $_GET['c'], 'uid' => local_user()]); + if (!DBA::isResult($contact)) { + return; + } - $base = System::baseUrl(); + $name = $contact['name']; + $id = $contact['id']; - $head_tpl = get_markup_template('poke_head.tpl'); - $a->page['htmlhead'] .= replace_macros($head_tpl,[ - '$baseurl' => System::baseUrl(true), - '$base' => $base + $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl'); + DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl,[ + '$baseurl' => DI::baseUrl()->get(true), ]); - - $parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0'); + $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0'); - $verbs = get_poke_verbs(); + $verbs = DI::l10n()->getPokeVerbs(); $shortlist = []; foreach ($verbs as $k => $v) { @@ -183,17 +172,17 @@ function poke_content(App $a) { } } - $tpl = get_markup_template('poke_content.tpl'); + $tpl = Renderer::getMarkupTemplate('poke_content.tpl'); - $o = replace_macros($tpl,[ - '$title' => L10n::t('Poke/Prod'), - '$desc' => L10n::t('poke, prod or do other things to somebody'), - '$clabel' => L10n::t('Recipient'), - '$choice' => L10n::t('Choose what you wish to do to recipient'), + $o = Renderer::replaceMacros($tpl,[ + '$title' => DI::l10n()->t('Poke/Prod'), + '$desc' => DI::l10n()->t('poke, prod or do other things to somebody'), + '$clabel' => DI::l10n()->t('Recipient'), + '$choice' => DI::l10n()->t('Choose what you wish to do to recipient'), '$verbs' => $shortlist, '$parent' => $parent, - '$prv_desc' => L10n::t('Make this post private'), - '$submit' => L10n::t('Submit'), + '$prv_desc' => DI::l10n()->t('Make this post private'), + '$submit' => DI::l10n()->t('Submit'), '$name' => $name, '$id' => $id ]);