X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=3148896bc27a8fa624bd4732bdfdf692d9b8f324;hb=421517c611834ccf4a982d319d5beb478407a9f2;hp=45a577cda6bfd3764e9ac2d723112eea76df74f2;hpb=c73d9611983b05cd1207d69c71a157c051b3f2e8;p=friendica.git

diff --git a/mod/poke.php b/mod/poke.php
index 45a577cda6..3148896bc2 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -1,45 +1,54 @@
-<?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
  */
 
-require_once('include/security.php');
-require_once('include/bbcode.php');
-require_once('include/items.php');
+use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
+require_once 'include/security.php';
+require_once 'include/items.php';
 
-function poke_init(&$a) {
+function poke_init(App $a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$uid = local_user();
 	$verb = notags(trim($_GET['verb']));
 
-	if(! $verb)
+	if (! $verb) {
 		return;
+	}
 
 	$verbs = get_poke_verbs();
 
-	if(! array_key_exists($verb,$verbs))
+	if (! array_key_exists($verb,$verbs)) {
 		return;
+	}
 
 	$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
 
 	$contact_id = intval($_GET['cid']);
-	if(! $contact_id)
+	if (! $contact_id) {
 		return;
+	}
 
 	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
@@ -52,7 +61,7 @@ function poke_init(&$a) {
 		intval($uid)
 	);
 
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		logger('poke: no contact ' . $contact_id);
 		return;
 	}
@@ -66,7 +75,7 @@ function poke_init(&$a) {
 			intval($parent),
 			intval($uid)
 		);
-		if(count($r)) {
+		if (DBM::is_result($r)) {
 			$parent_uri = $r[0]['uri'];
 			$private    = $r[0]['private'];
 			$allow_cid  = $r[0]['allow_cid'];
@@ -89,8 +98,9 @@ function poke_init(&$a) {
 
 	$uri = item_new_uri($a->get_hostname(),$uid);
 
-	$arr = array();
+	$arr = [];
 
+	$arr['guid']          = get_guid(32);
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
 	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
@@ -108,45 +118,36 @@ function poke_init(&$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;
 	$arr['object-type']   = ACTIVITY_OBJ_PERSON;
 
 	$arr['origin']        = 1;
-	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+	$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>' . $a->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");
 	$arr['object'] .= '</link></object>' . "\n";
 
-	$item_id = item_store($arr);
+	$item_id = Item::insert($arr);
 	if($item_id) {
-		//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-		//	dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
-		//	intval($uid),
-		//	intval($item_id)
-		//);
-		proc_run('php',"include/notifier.php","tag","$item_id");
+		Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
 	}
 
-
-	call_hooks('post_local_end', $arr);
-
-	proc_run('php',"include/notifier.php","like","$post_id");
+	Addon::callHooks('post_local_end', $arr);
 
 	return;
 }
 
 
 
-function poke_content(&$a) {
+function poke_content(App $a) {
 
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (! local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -158,20 +159,20 @@ function poke_content(&$a) {
 			intval($_GET['c']),
 			intval(local_user())
 		);
-		if(count($r)) {
+		if (DBM::is_result($r)) {
 			$name = $r[0]['name'];
 			$id = $r[0]['id'];
 		}
 	}
 
 
-	$base = $a->get_baseurl();
+	$base = System::baseUrl();
 
 	$head_tpl = get_markup_template('poke_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+	$a->page['htmlhead'] .= replace_macros($head_tpl,[
+		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
-	));
+	]);
 
 
 	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
@@ -179,26 +180,26 @@ function poke_content(&$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(
-		'$title' => t('Poke/Prod'),
-		'$desc' => t('poke, prod or do other things to somebody'),
-		'$clabel' => t('Recipient'),
-		'$choice' => t('Choose what you wish to do to recipient'),
+	$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'),
 		'$verbs' => $shortlist,
 		'$parent' => $parent,
-		'$prv_desc' => t('Make this post private'),
-		'$submit' => t('Submit'),
+		'$prv_desc' => L10n::t('Make this post private'),
+		'$submit' => L10n::t('Submit'),
 		'$name' => $name,
 		'$id' => $id
-	));
+	]);
 
 	return $o;