X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=db1c94963618f8acbe5f84e64d8b4a2acc8d4872;hb=94d255707735c5d444096c3e1edad8f972a1906e;hp=085415a76af84926b9f53a26373acc313d65b819;hpb=0ff93edeeef9cdb640395deaf1d1df586a809275;p=friendica.git
diff --git a/mod/poke.php b/mod/poke.php
index 085415a76a..db1c949636 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -12,8 +12,8 @@ function poke_init(&$a) {
$uid = local_user();
$verb = notags(trim($_GET['verb']));
-
- if(! $verb)
+
+ if(! $verb)
return;
$verbs = get_poke_verbs();
@@ -27,8 +27,8 @@ function poke_init(&$a) {
if(! $contact_id)
return;
+ $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
- $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
@@ -45,15 +45,41 @@ function poke_init(&$a) {
$target = $r[0];
+ if($parent) {
+ $r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid
+ from item where id = %d and parent = %d and uid = %d limit 1",
+ intval($parent),
+ intval($parent),
+ intval($uid)
+ );
+ if(count($r)) {
+ $parent_uri = $r[0]['uri'];
+ $private = $r[0]['private'];
+ $allow_cid = $r[0]['allow_cid'];
+ $allow_gid = $r[0]['allow_gid'];
+ $deny_cid = $r[0]['deny_cid'];
+ $deny_gid = $r[0]['deny_gid'];
+ }
+ }
+ else {
+
+ $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
+ $allow_cid = (($private) ? '<' . $target['id']. '>' : $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['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'];
@@ -64,10 +90,10 @@ function poke_init(&$a) {
$arr['author-link'] = $poster['url'];
$arr['author-avatar'] = $poster['thumb'];
$arr['title'] = '';
- $arr['allow_cid'] = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
- $arr['allow_gid'] = (($private) ? '' : $a->user['allow_gid']);
- $arr['deny_cid'] = (($private) ? '' : $a->user['deny_cid']);
- $arr['deny_gid'] = (($private) ? '' : $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;
@@ -85,11 +111,11 @@ 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)
- );
+ //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");
}
@@ -130,24 +156,27 @@ function poke_content(&$a) {
$a->page['htmlhead'] .= '';
$a->page['htmlhead'] .= <<< EOT
-
EOT;
+ $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
$verbs = get_poke_verbs();
@@ -165,6 +194,7 @@ EOT;
'$clabel' => t('Recipient'),
'$choice' => t('Choose what you wish to do to recipient'),
'$verbs' => $shortlist,
+ '$parent' => $parent,
'$prv_desc' => t('Make this post private'),
'$submit' => t('Submit'),
'$name' => $name,
@@ -173,4 +203,4 @@ EOT;
return $o;
-}
\ No newline at end of file
+}