X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=0034a2d87a50f966b269b57c317bcebc3ba14653;hb=8293d5ed0af78ae6cc5629bb1f982a7b29794d32;hp=b8a1ba7bfd1fcee0b935d10ff4d45ed04addb2ac;hpb=55e54bb9500f54bb075dcbc2054018de0969d9e7;p=friendica.git

diff --git a/mod/poke.php b/mod/poke.php
index b8a1ba7bfd..0034a2d87a 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -15,12 +15,13 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -38,13 +39,13 @@ function poke_init(App $a)
 
 	$verb = Strings::escapeTags(trim($_GET['verb']));
 
-	$verbs = L10n::getPokeVerbs();
+	$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) {
@@ -117,12 +118,12 @@ 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'] = '<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");
@@ -138,7 +139,7 @@ function poke_init(App $a)
 function poke_content(App $a)
 {
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -154,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
+	DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl,[
+		'$baseurl' => DI::baseUrl()->get(true),
 	]);
 
-
 	$parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0');
 
 
-	$verbs = L10n::getPokeVerbs();
+	$verbs = DI::l10n()->getPokeVerbs();
 
 	$shortlist = [];
 	foreach ($verbs as $k => $v) {
@@ -178,14 +175,14 @@ function poke_content(App $a)
 	$tpl = Renderer::getMarkupTemplate('poke_content.tpl');
 
 	$o = Renderer::replaceMacros($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'),
+		'$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
 	]);