X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=435da4dcd4facd27229767709633724529c690be;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=851396e68b22bba972c6cb4c3e8247875705cd1c;hpb=1a75507f784f860e3228a58928e5ac00eb0a216b;p=friendica.git
diff --git a/mod/poke.php b/mod/poke.php
index 851396e68b..435da4dcd4 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -1,4 +1,18 @@
-' : $a->user['allow_cid']);
+ $allow_gid = (($private) ? '' : $a->user['allow_gid']);
+ $deny_cid = (($private) ? '' : $a->user['deny_cid']);
+ $deny_gid = (($private) ? '' : $a->user['deny_gid']);
+ }
+
$poster = $a->contact;
- $uri = item_new_uri($a->get_hostname(),$owner_uid);
+ $uri = item_new_uri($a->get_hostname(),$uid);
$arr = array();
+ $arr['guid'] = get_guid(32);
$arr['uid'] = $uid;
$arr['uri'] = $uri;
- $arr['parent-uri'] = $uri;
+ $arr['parent-uri'] = (($parent_uri) ? $parent_uri : $uri);
$arr['type'] = 'activity';
$arr['wall'] = 1;
$arr['contact-id'] = $poster['id'];
@@ -62,13 +105,14 @@ function poke_init(&$a) {
$arr['author-link'] = $poster['url'];
$arr['author-avatar'] = $poster['thumb'];
$arr['title'] = '';
- $arr['allow_cid'] = $a->user['allow_cid'];
- $arr['allow_gid'] = $a->user['allow_gid'];
- $arr['deny_cid'] = $a->user['deny_cid'];
- $arr['deny_gid'] = $a->user['deny_gid'];
+ $arr['allow_cid'] = $allow_cid;
+ $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;
@@ -82,18 +126,18 @@ function poke_init(&$a) {
$item_id = item_store($arr);
if($item_id) {
- q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
- dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
- intval($uid),
- intval($item_id)
- );
- proc_run('php',"include/notifier.php","tag","$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(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
}
call_hooks('post_local_end', $arr);
- proc_run('php',"include/notifier.php","like","$post_id");
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
return;
}
@@ -107,35 +151,39 @@ function poke_content(&$a) {
return;
}
- $base = $a->get_baseurl();
+ $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(count($r)) {
+ $name = $r[0]['name'];
+ $id = $r[0]['id'];
+ }
+ }
- $a->page['htmlhead'] .= '';
- $a->page['htmlhead'] .= <<< EOT
-
-EOT;
+ $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
$verbs = get_poke_verbs();
$shortlist = array();
foreach($verbs as $k => $v)
- $shortlist[] = array($k,$v[1]);
+ if($v[1] !== 'NOTRANSLATION')
+ $shortlist[] = array($k,$v[1]);
$tpl = get_markup_template('poke_content.tpl');
@@ -146,9 +194,13 @@ EOT;
'$clabel' => t('Recipient'),
'$choice' => t('Choose what you wish to do to recipient'),
'$verbs' => $shortlist,
- '$submit' => t('Submit')
+ '$parent' => $parent,
+ '$prv_desc' => t('Make this post private'),
+ '$submit' => t('Submit'),
+ '$name' => $name,
+ '$id' => $id
));
return $o;
-}
\ No newline at end of file
+}