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

display page not updating after comment

Browse Source
This commit is contained in:
zotlabs 2017-02-21 15:24:39 -08:00
parent cbc0e5b934
commit bbacfbdd6a
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Zotlabs/Module/Display.php
View File

@ -1,6 +1,11 @@
<?php <?php
namespace Zotlabs\Module; namespace Zotlabs\Module;
require_once("include/bbcode.php");
require_once('include/security.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
require_once('include/items.php');
class Display extends \Zotlabs\Web\Controller { class Display extends \Zotlabs\Web\Controller {
@ -18,14 +23,6 @@ class Display extends \Zotlabs\Web\Controller {
return; return;
} }
require_once("include/bbcode.php");
require_once('include/security.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
require_once('include/items.php');
\App::$page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
if(argc() > 1 && argv(1) !== 'load') if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1); $item_hash = argv(1);
@ -40,6 +37,7 @@ class Display extends \Zotlabs\Web\Controller {
} }
$observer_is_owner = false; $observer_is_owner = false;
$updateable = false;
if(local_channel() && (! $update)) { if(local_channel() && (! $update)) {
@ -187,7 +185,6 @@ class Display extends \Zotlabs\Web\Controller {
if(($update && $load) || ($checkjs->disabled())) { if(($update && $load) || ($checkjs->disabled())) {
$updateable = false;
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start'])); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start']));
@ -199,7 +196,7 @@ class Display extends \Zotlabs\Web\Controller {
$sysid = $sys['channel_id']; $sysid = $sys['channel_id'];
if(local_channel()) { if(local_channel()) {
$r = q("SELECT * from item $r = q("SELECT item.id as item_id from item
WHERE uid = %d WHERE uid = %d
and mid = '%s' and mid = '%s'
$item_normal $item_normal
@ -213,6 +210,7 @@ class Display extends \Zotlabs\Web\Controller {
} }
} }
if($r === null) { if($r === null) {
// in case somebody turned off public access to sys channel content using permissions // in case somebody turned off public access to sys channel content using permissions
@ -222,7 +220,7 @@ class Display extends \Zotlabs\Web\Controller {
$sysid = 0; $sysid = 0;
$r = q("SELECT * from item $r = q("SELECT item.id as item_id from item
WHERE mid = '%s' WHERE mid = '%s'
AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = ''
AND item.deny_gid = '' AND item_private = 0 ) AND item.deny_gid = '' AND item_private = 0 )
@ -247,9 +245,9 @@ class Display extends \Zotlabs\Web\Controller {
$sysid = $sys['channel_id']; $sysid = $sys['channel_id'];
if(local_channel()) { if(local_channel()) {
$r = q("SELECT * from item $r = q("SELECT item.parent AS item_id from item
WHERE uid = %d WHERE uid = %d
and mid = '%s' and parent_mid = '%s'
$item_normal $item_normal
$simple_update $simple_update
limit 1", limit 1",
@ -260,14 +258,15 @@ class Display extends \Zotlabs\Web\Controller {
$updateable = true; $updateable = true;
} }
} }
if($r === null) { if($r === null) {
// in case somebody turned off public access to sys channel content using permissions // in case somebody turned off public access to sys channel content using permissions
// make that content unsearchable by ensuring the owner_xchan can't match // make that content unsearchable by ensuring the owner_xchan can't match
if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
$sysid = 0; $sysid = 0;
$r = q("SELECT * from item $r = q("SELECT item.parent AS item_id from item
WHERE mid = '%s' WHERE parent_mid = '%s'
AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = ''
AND item.deny_gid = '' AND item_private = 0 ) AND item.deny_gid = '' AND item_private = 0 )
and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
@ -289,7 +288,7 @@ class Display extends \Zotlabs\Web\Controller {
if($r) { if($r) {
$parents_str = ids_to_querystr($r,'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
@ -319,7 +318,7 @@ class Display extends \Zotlabs\Web\Controller {
if($updateable) { if($updateable) {
$x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ", $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
intval(local_channel()), intval(local_channel()),
intval($r[0]['parent']) intval($r[0]['item_id'])
); );
} }

7
view/js/mod_display.js Normal file
View File

@ -0,0 +1,7 @@
<script>
$(document).ready(function() {
$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
// make auto-complete work in more places
$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
});
</script>