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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2018-04-16 20:28:22 -07:00
commit 120e578a67
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zotlabs/Module/Network.php
View File

@ -210,10 +210,9 @@ class Network extends \Zotlabs\Web\Controller {
$sql_nets = ''; $sql_nets = '';
$distinct = '';
$item_thread_top = ' AND item_thread_top = 1 '; $item_thread_top = ' AND item_thread_top = 1 ';
$sql_extra = $sql_options; $sql_extra = '';
if($group) { if($group) {
$contact_str = ''; $contact_str = '';
@ -229,7 +228,6 @@ class Network extends \Zotlabs\Web\Controller {
$contact_str = ' 0 '; $contact_str = ' 0 ';
info( t('Privacy group is empty')); info( t('Privacy group is empty'));
} }
$distinct = ' distinct ';
$item_thread_top = ''; $item_thread_top = '';
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) "; $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
@ -254,7 +252,6 @@ class Network extends \Zotlabs\Web\Controller {
intval(local_channel()) intval(local_channel())
); );
if($r) { if($r) {
$distinct = ' distinct ';
$item_thread_top = ''; $item_thread_top = '';
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) "; $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) ";
$title = replace_macros(get_markup_template("section_title.tpl"),array( $title = replace_macros(get_markup_template("section_title.tpl"),array(
@ -274,7 +271,6 @@ class Network extends \Zotlabs\Web\Controller {
dbesc($xchan) dbesc($xchan)
); );
if($r) { if($r) {
$distinct = ' distinct ';
$item_thread_top = ''; $item_thread_top = '';
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) "; $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
$title = replace_macros(get_markup_template("section_title.tpl"),array( $title = replace_macros(get_markup_template("section_title.tpl"),array(
@ -381,7 +377,6 @@ class Network extends \Zotlabs\Web\Controller {
} }
if($conv) { if($conv) {
$distinct = ' distinct ';
$item_thread_top = ''; $item_thread_top = '';
$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ", $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
dbesc(protect_sprintf($channel['channel_hash'])) dbesc(protect_sprintf($channel['channel_hash']))
@ -464,7 +459,7 @@ class Network extends \Zotlabs\Web\Controller {
WHERE true $uids $item_normal WHERE true $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)
$simple_update $simple_update
$sql_extra $sql_nets $sql_extra $sql_options $sql_nets
$net_query2 $net_query2
ORDER BY item.received DESC $pager_sql " ORDER BY item.received DESC $pager_sql "
); );
@ -487,13 +482,13 @@ class Network extends \Zotlabs\Web\Controller {
if($load) { if($load) {
// Fetch a page full of parent items for this page // Fetch a page full of parent items for this page
$r = q("SELECT $distinct item.parent AS item_id FROM item $r = q("SELECT item.parent AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query $net_query
WHERE true $uids $item_thread_top $item_normal WHERE true $uids $item_thread_top $item_normal
AND item.mid = item.parent_mid AND item.mid = item.parent_mid
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_options $sql_nets
$net_query2 $net_query2
ORDER BY $ordering DESC $pager_sql " ORDER BY $ordering DESC $pager_sql "
); );
@ -506,7 +501,7 @@ class Network extends \Zotlabs\Web\Controller {
$net_query $net_query
WHERE true $uids $item_normal_update $simple_update WHERE true $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 $net_query2" $sql_extra3 $sql_extra $sql_options $sql_nets $net_query2"
); );
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
} }

2
Zotlabs/Module/Pubstream.php
View File

@ -224,7 +224,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
); );
} }
else { else {
$r = q("SELECT distinct parent AS item_id, $ordering FROM item $r = q("SELECT parent 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
$net_query $net_query
WHERE true $uids $item_normal_update WHERE true $uids $item_normal_update

3
view/theme/redbasic/css/style.css
View File

@ -120,6 +120,9 @@ a:focus,
input, optgroup, select, textarea { input, optgroup, select, textarea {
font-size: 0.9rem !important; font-size: 0.9rem !important;
}
input[type=text], textarea {
resize: vertical; resize: vertical;
background-color: $comment_item_colour; background-color: $comment_item_colour;
color: $font_colour; color: $font_colour;