From 953c8ac68675d2f866489b040e2defea855f5c83 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 18 Aug 2014 21:25:02 +0200 Subject: make lockview provide the right info --- mod/lockview.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mod/lockview.php') diff --git a/mod/lockview.php b/mod/lockview.php index 8903bdec6..86d238593 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -26,11 +26,6 @@ function lockview_content(&$a) { $item = $r[0]; - if(array_key_exists('public_policy',$item) && $item['public_policy']) { - echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; - killme(); - } - if($item['uid'] != local_user()) { echo '
  • ' . t('Remote privacy information not available.') . '
    • '; killme(); @@ -83,4 +78,8 @@ function lockview_content(&$a) { echo $o . implode($l); killme(); + if(array_key_exists('public_policy',$item) && $item['public_policy']) { + echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; + killme(); + } } -- cgit v1.2.3 From a10f39b9942d6805d62351e06b0b89e5bc999bf5 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 19 Aug 2014 22:01:33 +0200 Subject: really fix lock info --- mod/lockview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/lockview.php') diff --git a/mod/lockview.php b/mod/lockview.php index 86d238593..7d39f9e2f 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -33,7 +33,7 @@ function lockview_content(&$a) { if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { - echo '
  • ' . t('Remote privacy information not available.') . '
    • '; + echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; killme(); } @@ -82,4 +82,5 @@ function lockview_content(&$a) { echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; killme(); } + } -- cgit v1.2.3 From 82389f8c1b9e43050589da6ea3dda8cac399db9b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 16:04:38 -0700 Subject: really really fix lockview (cross fingers) ;-) --- mod/lockview.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mod/lockview.php') diff --git a/mod/lockview.php b/mod/lockview.php index 7d39f9e2f..6673ae709 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -33,7 +33,13 @@ function lockview_content(&$a) { if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { - echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; + + // if the post is private, but public_policy is blank ("visible to the internet"), and there aren't any + // specific recipients, we're the recipient of a post with "bcc" or targeted recipients; so we'll just show it + // as unknown specific recipients. The sender will have the visibility list and will fall through to the + // next section. + + echo '
  • ' . translate_scope((! $item['public_policy']) ? PERMS_SPECIFIC : $item['public_policy']) . '
    • '; killme(); } @@ -78,9 +84,5 @@ function lockview_content(&$a) { echo $o . implode($l); killme(); - if(array_key_exists('public_policy',$item) && $item['public_policy']) { - echo '
  • ' . translate_scope($item['public_policy']) . '
    • '; - killme(); - } } -- cgit v1.2.3 From d0af6b501fa13c39abd5319e4fce80f3f22d6947 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 04:04:38 -0700 Subject: really really really fix lockview - maybe --- mod/lockview.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mod/lockview.php') diff --git a/mod/lockview.php b/mod/lockview.php index 6673ae709..51f7c29f3 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -16,11 +16,12 @@ function lockview_content(&$a) { if (!in_array($type, array('item','photo','event'))) killme(); - + $r = q("SELECT * FROM %s WHERE id = %d LIMIT 1", dbesc($type), intval($item_id) ); + if(! $r) killme(); @@ -39,7 +40,7 @@ function lockview_content(&$a) { // as unknown specific recipients. The sender will have the visibility list and will fall through to the // next section. - echo '
  • ' . translate_scope((! $item['public_policy']) ? PERMS_SPECIFIC : $item['public_policy']) . '
    • '; + echo '
  • ' . translate_scope((! $item['public_policy']) ? 'contacts' : $item['public_policy']) . '
    • '; killme(); } -- cgit v1.2.3 From f526a10f07086ffeb5018b913916827a556f2fa1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 04:14:49 -0700 Subject: let's make this "specific" since that's what it is. --- mod/lockview.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/lockview.php') diff --git a/mod/lockview.php b/mod/lockview.php index 51f7c29f3..e39f2707b 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -40,7 +40,7 @@ function lockview_content(&$a) { // as unknown specific recipients. The sender will have the visibility list and will fall through to the // next section. - echo '
  • ' . translate_scope((! $item['public_policy']) ? 'contacts' : $item['public_policy']) . '
    • '; + echo '
  • ' . translate_scope((! $item['public_policy']) ? 'specific' : $item['public_policy']) . '
    • '; killme(); } -- cgit v1.2.3