X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=e8ddf86cd3ad3abc4f527f2a7a0bcf19e440d046;hb=154df8f9d175d7081f73d6453d1ef71e69869d22;hp=91f33c0def2fd43a2991fb1aef40b41109f0f9da;hpb=99b8f856242346a046152ebe9033846e06c35f3b;p=friendica.git

diff --git a/mod/poke.php b/mod/poke.php
index 91f33c0def..e8ddf86cd3 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -14,15 +14,15 @@
  */
 
 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;
-
-require_once 'include/security.php';
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
 
 function poke_init(App $a)
 {
@@ -36,9 +36,9 @@ 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;
@@ -51,10 +51,10 @@ function poke_init(App $a)
 		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",
@@ -63,7 +63,7 @@ function poke_init(App $a)
 	);
 
 	if (!DBA::isResult($r)) {
-		logger('poke: no contact ' . $contact_id);
+		Logger::log('poke: no contact ' . $contact_id);
 		return;
 	}
 
@@ -83,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']);
@@ -97,7 +97,7 @@ function poke_init(App $a)
 
 	$arr = [];
 
-	$arr['guid']          = System::createGUID(32);
+	$arr['guid']          = System::createUUID();
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
 	$arr['parent-uri']    = (!empty($parent_uri) ? $parent_uri : $uri);
@@ -123,17 +123,14 @@ function poke_init(App $a)
 	$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'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
+	$arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
 
-	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\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);
-	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;
 }
@@ -145,9 +142,6 @@ function poke_content(App $a)
 		return;
 	}
 
-	$name = '';
-	$id = '';
-
 	if (empty($_GET['c'])) {
 		return;
 	}
@@ -160,19 +154,15 @@ function poke_content(App $a)
 	$name = $contact['name'];
 	$id = $contact['id'];
 
-	$base = System::baseUrl();
-
-	$head_tpl = get_markup_template('poke_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($head_tpl,[
+	$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) {
@@ -181,9 +171,9 @@ function poke_content(App $a)
 		}
 	}
 
-	$tpl = get_markup_template('poke_content.tpl');
+	$tpl = Renderer::getMarkupTemplate('poke_content.tpl');
 
-	$o = replace_macros($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'),