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

whitespace

Browse Source
This commit is contained in:
Mario Vavti 2017-09-04 13:34:17 +02:00
parent 06f1910ac0
commit b4f8136315
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Module/Display.php
View File

@ -17,13 +17,11 @@ class Display extends \Zotlabs\Web\Controller {
if($load) if($load)
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
if(observer_prohibited()) { if(observer_prohibited()) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
if(argc() > 1 && argv(1) !== 'load') if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1); $item_hash = argv(1);
@ -39,12 +37,10 @@ class Display extends \Zotlabs\Web\Controller {
$observer_is_owner = false; $observer_is_owner = false;
$updateable = false; $updateable = false;
if(local_channel() && (! $update)) { if(local_channel() && (! $update)) {
$channel = \App::get_channel(); $channel = \App::get_channel();
$channel_acl = array( $channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'], 'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'], 'allow_gid' => $channel['channel_allow_gid'],
@ -52,7 +48,6 @@ class Display extends \Zotlabs\Web\Controller {
'deny_gid' => $channel['channel_deny_gid'] 'deny_gid' => $channel['channel_deny_gid']
); );
$x = array( $x = array(
'is_owner' => true, 'is_owner' => true,
'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
@ -137,7 +132,6 @@ class Display extends \Zotlabs\Web\Controller {
if((! $update) && (! $load)) { if((! $update) && (! $load)) {
$static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1);
$o .= '<div id="live-display"></div>' . "\r\n"; $o .= '<div id="live-display"></div>' . "\r\n";
@ -211,9 +205,7 @@ class Display extends \Zotlabs\Web\Controller {
); );
if($r) { if($r) {
$updateable = true; $updateable = true;
} }
} }
if($r === null) { if($r === null) {
@ -248,7 +240,6 @@ class Display extends \Zotlabs\Web\Controller {
$sysid = $sys['channel_id']; $sysid = $sys['channel_id'];
if(local_channel()) { if(local_channel()) {
$r = q("SELECT item.parent AS item_id from item $r = q("SELECT item.parent AS item_id from item
WHERE uid = %d WHERE uid = %d
and parent_mid = '%s' and parent_mid = '%s'
@ -291,10 +282,8 @@ class Display extends \Zotlabs\Web\Controller {
} }
if($r) { if($r) {
$parents_str = ids_to_querystr($r,'item_id'); $parents_str = ids_to_querystr($r,'item_id');
if($parents_str) { if($parents_str) {
$items = q("SELECT item.*, item.id AS item_id $items = q("SELECT item.*, item.id AS item_id
FROM item FROM item
WHERE parent in ( %s ) $item_normal ", WHERE parent in ( %s ) $item_normal ",
@ -305,7 +294,8 @@ class Display extends \Zotlabs\Web\Controller {
$items = fetch_post_tags($items,true); $items = fetch_post_tags($items,true);
$items = conv_sort($items,'created'); $items = conv_sort($items,'created');
} }
} else { }
else {
$items = array(); $items = array();
} }
@ -327,7 +317,6 @@ class Display extends \Zotlabs\Web\Controller {
$o .= '<div id="content-complete"></div>'; $o .= '<div id="content-complete"></div>';
if((($update && $load) || $checkjs->disabled()) && (! $items)) { if((($update && $load) || $checkjs->disabled()) && (! $items)) {
$r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1", $r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
@ -351,5 +340,4 @@ class Display extends \Zotlabs\Web\Controller {
} }
} }