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

progress on mod/display - slow but any progress is good

Browse Source
This commit is contained in:
friendica 2013-02-10 16:04:03 -08:00
parent 99c5f88963
commit 2cfd73c57d
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/conversation.php
View File

@ -714,6 +714,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
if($page_mode === 'preview') if($page_mode === 'preview')
logger('preview: ' . print_r($threads,true)); logger('preview: ' . print_r($threads,true));
// Do not un-comment if smarty3 is in use
// logger('page_template: ' . $page_template); // logger('page_template: ' . $page_template);
// logger('nouveau: ' . print_r($threads,true)); // logger('nouveau: ' . print_r($threads,true));

33
mod/display.php
View File

@ -89,7 +89,7 @@ dbg(0);
$sql_extra = public_permissions_sql(get_observer_hash()); $sql_extra = public_permissions_sql(get_observer_hash());
if($load) { if($update && $load) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
@ -97,11 +97,11 @@ dbg(0);
dbg(1); dbg(1);
$r = q("SELECT * from item $r = q("SELECT * from item
WHERE item_restrict = 0 WHERE item_restrict = 0
AND ( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and uid in ( " . stream_perms_api_uids() . " )
$sql_extra
and uri = '%s' and uri = '%s'
AND ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = ''
AND `item`.`deny_gid` = '' AND item_private = 0 )
and uid in ( " . stream_perms_api_uids() . " ))
$sql_extra )
group by uri limit 1", group by uri limit 1",
dbesc($target_item['parent_uri']) dbesc($target_item['parent_uri'])
); );
@ -134,28 +134,13 @@ dbg(0);
} }
if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { $o .= conversation($a,$items,'display', $update, 'client');
notice( t('Access to this profile has been restricted.') . EOL); return $o;
return;
}
if($items) {
// if((local_user()) && (local_user() == $owner)) {
// q("UPDATE `item` SET `unseen` = 0
// WHERE `parent` = %d AND `unseen` = 1",
// intval($r[0]['parent'])
// );
// }
// xchan_query($items);
// $items = fetch_post_tags($items);
$o .= conversation($a,$items,'display', $update, 'client');
}
/* /*
else { elseif((! $update) && (! {
$r = q("SELECT `id`, item_flags FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1", $r = q("SELECT `id`, item_flags FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
dbesc($item_hash), dbesc($item_hash),
dbesc($item_hash) dbesc($item_hash)

2
mod/update_display.php
View File

@ -8,6 +8,8 @@ require_once('include/group.php');
function update_display_content(&$a) { function update_display_content(&$a) {
$profile_uid = intval($_GET['p']); $profile_uid = intval($_GET['p']);
if(! $profile_uid)
$profile_uid = (-1);
$load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0); $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0);
header("Content-type: text/html"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";