Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 02:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pubstream single view fixes

Browse source
This commit is contained in:
Mario Vavti 2017-10-07 16:40:43 +02:00
parent 4c0e8a61ae
commit 71c206fdb9
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Zotlabs/Module/Pubstream.php
View file

@ -22,13 +22,18 @@ class Pubstream extends \Zotlabs\Web\Controller {
$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
if(strpos($mid,'b64.') === 0)
$decoded = @base64url_decode(substr($mid,4));
if($decoded)
$mid = $decoded;
$item_normal = item_normal(); $item_normal = item_normal();
$item_normal_update = item_normal_update(); $item_normal_update = item_normal_update();
$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
if(! $update) { if(! $update && !$load) {
nav_set_selected(t('Public Stream')); nav_set_selected(t('Public Stream'));
@ -46,6 +51,10 @@ class Pubstream extends \Zotlabs\Web\Controller {
. "; var profile_page = " . \App::$pager['page'] . "; var profile_page = " . \App::$pager['page']
. "; divmore_height = " . intval($maxheight) . "; </script>\r\n"; . "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
//if we got a decoded hash we must encode it again before handing to javascript
if($decoded)
$mid = 'b64.' . base64url_encode($mid);
\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
'$baseurl' => z_root(), '$baseurl' => z_root(),
'$pgtype' => 'pubstream', '$pgtype' => 'pubstream',
@ -127,7 +136,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
left join abook on item.author_xchan = abook.abook_xchan left join abook on item.author_xchan = abook.abook_xchan
WHERE mid like '%s' $uids $item_normal WHERE mid like '%s' $uids $item_normal
and (abook.abook_blocked = 0 or abook.abook_flags is null) and (abook.abook_blocked = 0 or abook.abook_flags is null)
$sql_extra3 $sql_extra $sql_nets", $sql_extra3 $sql_extra $sql_nets LIMIT 1",
dbesc($mid . '%') dbesc($mid . '%')
); );
} }
@ -149,7 +158,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
left join abook on item.author_xchan = abook.abook_xchan left join abook on item.author_xchan = abook.abook_xchan
WHERE mid like '%s' $uids $item_normal_update $simple_update WHERE mid like '%s' $uids $item_normal_update $simple_update
and (abook.abook_blocked = 0 or abook.abook_flags is null) and (abook.abook_blocked = 0 or abook.abook_flags is null)
$sql_extra3 $sql_extra $sql_nets", $sql_extra3 $sql_extra $sql_nets LIMIT 1",
dbesc($mid . '%') dbesc($mid . '%')
); );
} }
@ -193,6 +202,9 @@ class Pubstream extends \Zotlabs\Web\Controller {
$mode = ('network'); $mode = ('network');
$o .= conversation($items,$mode,$update,$page_mode); $o .= conversation($items,$mode,$update,$page_mode);
if($mid)
$o .= '<div id="content-complete"></div>';
if(($items) && (! $update)) if(($items) && (! $update))
$o .= alt_pager($a,count($items)); $o .= alt_pager($a,count($items));