harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #259 from zzottel/master

Browse Source 
Finish up channel/ plinks
This commit is contained in:
friendica 2014-01-09 14:10:51 -08:00
commit bf31ec04cf
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/identity.php
View File

@ -1023,7 +1023,7 @@ function zid_init(&$a) {
dbesc($tmp_str) dbesc($tmp_str)
); );
// try to avoid recursion - but send them home to do a proper magic auth // try to avoid recursion - but send them home to do a proper magic auth
$dest = '/' . $a->query_string; $dest = '/' . urlencode($a->query_string);
$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest); $dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest);
@ -1140,4 +1140,4 @@ function is_foreigner($s) {
function is_member($s) { function is_member($s) {
return((is_foreigner($s)) ? false : true); return((is_foreigner($s)) ? false : true);
} }

10
include/items.php
View File

@ -1602,8 +1602,14 @@ function item_store($arr,$allow_exec = false) {
$arr['llink'] = z_root() . '/display/' . $arr['mid']; $arr['llink'] = z_root() . '/display/' . $arr['mid'];
if(! $arr['plink']) if((! $arr['plink'])) {
$arr['plink'] = $arr['llink']; if (local_user() && ($arr['item_flags'] & ITEM_THREAD_TOP)) {
$channel = get_app()->get_channel();
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?mid=' . $arr['mid'];
} else {
$arr['plink'] = $arr['llink'];
}
}
if($arr['parent_mid'] === $arr['mid']) { if($arr['parent_mid'] === $arr['mid']) {
$parent_id = 0; $parent_id = 0;

2
include/text.php
View File

@ -1391,7 +1391,7 @@ function feed_salmonlinks($nick) {
function get_plink($item,$mode) { function get_plink($item,$mode) {
$a = get_app(); $a = get_app();
if($mode == 'display') if(($mode == 'display') || ($mode == 'channel') || ($mode == 'network'))
$key = 'plink'; $key = 'plink';
else else
$key = 'llink'; $key = 'llink';

31
mod/channel.php
View File

@ -177,6 +177,10 @@ function channel_content(&$a, $update = 0, $load = false) {
$r = q("SELECT parent AS item_id from item where mid = '%s' limit 1", $r = q("SELECT parent AS item_id from item where mid = '%s' limit 1",
dbesc($mid) dbesc($mid)
); );
if (! $r) {
notice( t('Item not found.') . EOL);
}
} else { } else {
$r = q("SELECT distinct id AS item_id FROM item $r = q("SELECT distinct id AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan left join abook on item.author_xchan = abook.abook_xchan
@ -197,6 +201,23 @@ function channel_content(&$a, $update = 0, $load = false) {
} }
} }
if ($mid && $r) {
// make sure we don't show other people's posts from our matrix
// as $a->profile['channel_hash'] isn't set when a JS query comes in
// we have to do that with a join
$ismine = q("SELECT * from item
join channel on item.owner_xchan = channel.channel_hash
where item.id = %d and channel.channel_id = %d",
dbesc($r[0]['item_id']),
intval($a->profile['profile_uid'])
);
if (!$ismine) {
if ($load)
notice( t('Permission denied.') . EOL);
$r = array();
}
}
if($r) { if($r) {
$parents_str = ids_to_querystr($r,'item_id'); $parents_str = ids_to_querystr($r,'item_id');
@ -214,12 +235,10 @@ function channel_content(&$a, $update = 0, $load = false) {
$items = fetch_post_tags($items, true); $items = fetch_post_tags($items, true);
$items = conv_sort($items,'created'); $items = conv_sort($items,'created');
if ($mid && (! count($items))) { if ($load && $mid && (! count($items))) {
// This will happen if channel is called with a mid from another // This will happen if we don't have sufficient permissions
// channel, if we don't have sufficient permissions to view the // to view the parent item (or the item itself if it is toplevel)
// item, or if it doesn't exist. notice( t('Permission denied.') . EOL);
// Do we need separate error messages for that?
notice( t('Item not found.') . EOL);
} }
} else { } else {