X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=48eeec85a2df7419b195440268a36bc6bbce74bd;hb=745bc7cf3f3990a8887fcc806a16d218f82e35db;hp=2e15ed853ff395be7363279c8d9499871d3348a4;hpb=ee39aba490fb7e17ba9c01a9a4f4aedc51bee564;p=friendica.git

diff --git a/mod/poke.php b/mod/poke.php
index 2e15ed853f..48eeec85a2 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -1,25 +1,30 @@
-<?php /** @file */
+<?php
 
 /**
- *
  * Poke, prod, finger, or otherwise do unspeakable things to somebody - who must be a connection in your address book
  * This function can be invoked with the required arguments (verb and cid and private and possibly parent) silently via ajax or
- * other web request. You must be logged in and connected to a profile. 
+ * other web request. You must be logged in and connected to a profile.
  * If the required arguments aren't present, we'll display a simple form to choose a recipient and a verb.
  * parent is a special argument which let's you attach this activity as a comment to an existing conversation, which
  * may have started with somebody else poking (etc.) somebody, but this isn't necessary. This can be used in the more pokes
- * plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.  
+ * addon version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
  *
  * private creates a private conversation with the recipient. Otherwise your profile's default post privacy is used.
  *
+ * @file mod/poke.php
  */
 
+use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
 
-
-function poke_init(App &$a) {
+function poke_init(App $a) {
 
 	if (! local_user()) {
 		return;
@@ -56,7 +61,7 @@ function poke_init(App &$a) {
 		intval($uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('poke: no contact ' . $contact_id);
 		return;
 	}
@@ -70,7 +75,7 @@ function poke_init(App &$a) {
 			intval($parent),
 			intval($uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$parent_uri = $r[0]['uri'];
 			$private    = $r[0]['private'];
 			$allow_cid  = $r[0]['allow_cid'];
@@ -93,7 +98,7 @@ function poke_init(App &$a) {
 
 	$uri = item_new_uri($a->get_hostname(),$uid);
 
-	$arr = array();
+	$arr = [];
 
 	$arr['guid']          = get_guid(32);
 	$arr['uid']           = $uid;
@@ -113,7 +118,6 @@ function poke_init(App &$a) {
 	$arr['allow_gid']     = $allow_gid;
 	$arr['deny_cid']      = $deny_cid;
 	$arr['deny_gid']      = $deny_gid;
-	$arr['last-child']    = 1;
 	$arr['visible']       = 1;
 	$arr['verb']          = $activity;
 	$arr['private']       = $private;
@@ -122,7 +126,7 @@ function poke_init(App &$a) {
 	$arr['origin']        = 1;
 	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
-	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . App::get_baseurl() . '/contact/' . $target['id'] . '</id>';
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
 	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
 
 	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
@@ -131,24 +135,24 @@ function poke_init(App &$a) {
 	$item_id = item_store($arr);
 	if($item_id) {
 		//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-		//	dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+		//	dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
 		//	intval($uid),
 		//	intval($item_id)
 		//);
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+		Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
 	}
 
 
-	call_hooks('post_local_end', $arr);
+	Addon::callHooks('post_local_end', $arr);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
+	Worker::add(PRIORITY_HIGH, "Notifier", "like", $post_id);
 
 	return;
 }
 
 
 
-function poke_content(App &$a) {
+function poke_content(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -163,20 +167,20 @@ function poke_content(App &$a) {
 			intval($_GET['c']),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$name = $r[0]['name'];
 			$id = $r[0]['id'];
 		}
 	}
 
 
-	$base = App::get_baseurl();
+	$base = System::baseUrl();
 
 	$head_tpl = get_markup_template('poke_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
-		'$baseurl' => App::get_baseurl(true),
+	$a->page['htmlhead'] .= replace_macros($head_tpl,[
+		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
-	));
+	]);
 
 
 	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
@@ -184,15 +188,15 @@ function poke_content(App &$a) {
 
 	$verbs = get_poke_verbs();
 
-	$shortlist = array();
+	$shortlist = [];
 	foreach($verbs as $k => $v)
 		if($v[1] !== 'NOTRANSLATION')
-			$shortlist[] = array($k,$v[1]);
+			$shortlist[] = [$k,$v[1]];
 
 
 	$tpl = get_markup_template('poke_content.tpl');
 
-	$o = replace_macros($tpl,array(
+	$o = replace_macros($tpl,[
 		'$title' => t('Poke/Prod'),
 		'$desc' => t('poke, prod or do other things to somebody'),
 		'$clabel' => t('Recipient'),
@@ -203,7 +207,7 @@ function poke_content(App &$a) {
 		'$submit' => t('Submit'),
 		'$name' => $name,
 		'$id' => $id
-	));
+	]);
 
 	return $o;