X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoke.php;h=45a577cda6bfd3764e9ac2d723112eea76df74f2;hb=6e2c09b1ea6da8f268d336c1dd73590f080e0180;hp=8fdbaa5170767072db43d1738adc60747736ab33;hpb=9c72b45f36dcdf141c0698c2e6219bf914827881;p=friendica.git
diff --git a/mod/poke.php b/mod/poke.php
index 8fdbaa5170..45a577cda6 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['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 +104,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,11 +125,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");
}
@@ -111,7 +154,7 @@ function poke_content(&$a) {
$id = '';
if(intval($_GET['c'])) {
- $r = q("select id,name from contact where id = %d and uid = %d limit 1",
+ $r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($_GET['c']),
intval(local_user())
);
@@ -124,26 +167,14 @@ function poke_content(&$a) {
$base = $a->get_baseurl();
- $a->page['htmlhead'] .= '';
- $a->page['htmlhead'] .= <<< EOT
-
-
-EOT;
+ $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
$verbs = get_poke_verbs();
@@ -162,6 +193,8 @@ 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,
'$id' => $id
@@ -169,4 +202,4 @@ EOT;
return $o;
-}
\ No newline at end of file
+}