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-01-29 18:57:15 -08:00
commit 4f24cc7377
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Zotlabs/Module/Cards.php
View File

@ -19,6 +19,10 @@ class Cards extends \Zotlabs\Web\Controller {
} }
/**
* {@inheritDoc}
* @see \Zotlabs\Web\Controller::get()
*/
function get($update = 0, $load = false) { function get($update = 0, $load = false) {
if(observer_prohibited(true)) { if(observer_prohibited(true)) {
@ -31,7 +35,7 @@ class Cards extends \Zotlabs\Web\Controller {
return; return;
} }
if(! feature_enabled(\App::$profile_uid,'cards')) { if(! feature_enabled(\App::$profile_uid, 'cards')) {
return; return;
} }
@ -48,7 +52,7 @@ class Cards extends \Zotlabs\Web\Controller {
$category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : ''); $category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
if($category) { if($category) {
$sql_extra2 .= protect_sprintf(term_item_parent_query(\App::$profile['profile_uid'],'item', $category, TERM_CATEGORY)); $sql_extra2 .= protect_sprintf(term_item_parent_query(\App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
} }
@ -64,7 +68,7 @@ class Cards extends \Zotlabs\Web\Controller {
$ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
if(! perm_is_allowed($owner,$ob_hash,'view_pages')) { if(! perm_is_allowed($owner, $ob_hash, 'view_pages')) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
@ -74,12 +78,12 @@ class Cards extends \Zotlabs\Web\Controller {
$channel = channelx_by_n($owner); $channel = channelx_by_n($owner);
if($channel) { if($channel) {
$channel_acl = array( $channel_acl = [
'allow_cid' => $channel['channel_allow_cid'], 'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'], 'allow_gid' => $channel['channel_allow_gid'],
'deny_cid' => $channel['channel_deny_cid'], 'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid'] 'deny_gid' => $channel['channel_deny_gid']
); ];
} }
else { else {
$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; $channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
@ -87,7 +91,7 @@ class Cards extends \Zotlabs\Web\Controller {
if(perm_is_allowed($owner,$ob_hash,'write_pages')) { if(perm_is_allowed($owner, $ob_hash, 'write_pages')) {
$x = [ $x = [
'webpage' => ITEM_TYPE_CARD, 'webpage' => ITEM_TYPE_CARD,
@ -110,7 +114,7 @@ class Cards extends \Zotlabs\Web\Controller {
'layoutselect' => false, 'layoutselect' => false,
'expanded' => false, 'expanded' => false,
'novoting' => false, 'novoting' => false,
'catsenabled' => feature_enabled($owner,'categories'), 'catsenabled' => feature_enabled($owner, 'categories'),
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true 'bbcode' => true
]; ];
@ -119,8 +123,8 @@ class Cards extends \Zotlabs\Web\Controller {
$x['title'] = $_REQUEST['title']; $x['title'] = $_REQUEST['title'];
if($_REQUEST['body']) if($_REQUEST['body'])
$x['body'] = $_REQUEST['body']; $x['body'] = $_REQUEST['body'];
$editor = status_editor($a,$x);
$editor = status_editor($a, $x);
} }
else { else {
$editor = ''; $editor = '';
@ -149,9 +153,10 @@ class Cards extends \Zotlabs\Web\Controller {
and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
and item.item_blocked = 0 "; and item.item_blocked = 0 ";
$items_result = [];
if($r) { if($r) {
$parents_str = ids_to_querystr($r,'id'); $parents_str = ids_to_querystr($r, 'id');
$items = q("SELECT item.*, item.id AS item_id $items = q("SELECT item.*, item.id AS item_id
FROM item FROM item
@ -164,21 +169,19 @@ class Cards extends \Zotlabs\Web\Controller {
if($items) { if($items) {
xchan_query($items); xchan_query($items);
$items = fetch_post_tags($items, true); $items = fetch_post_tags($items, true);
$items = conv_sort($items,'updated'); $items_result = conv_sort($items, 'updated');
} }
else
$items = [];
} }
$mode = 'cards'; $mode = 'cards';
$content = conversation($items,$mode,false,'traditional'); $content = conversation($items_result, $mode, false, 'traditional');
$o = replace_macros(get_markup_template('cards.tpl'), [ $o = replace_macros(get_markup_template('cards.tpl'), [
'$title' => t('Cards'), '$title' => t('Cards'),
'$editor' => $editor, '$editor' => $editor,
'$content' => $content, '$content' => $content,
'$pager' => alt_pager($a,count($items)) '$pager' => alt_pager($a, count($items_result))
]); ]);
return $o; return $o;

4
view/tpl/connections.tpl
View File

@ -5,7 +5,7 @@
<i class="fa fa-search"></i>&nbsp;{{$label}} <i class="fa fa-search"></i>&nbsp;{{$label}}
</button> </button>
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
<i class="fa fa-sort"></i> <i class="fa fa-filter"></i>
</button> </button>
<div class="dropdown-menu dropdown-menu-right"> <div class="dropdown-menu dropdown-menu-right">
{{foreach $tabs as $menu}} {{foreach $tabs as $menu}}
@ -25,7 +25,7 @@
</div> </div>
</form> </form>
</div> </div>
<div id="connections-wrapper clearfix"> <div class="connections-wrapper clearfix">
{{foreach $contacts as $contact}} {{foreach $contacts as $contact}}
{{include file="connection_template.tpl"}} {{include file="connection_template.tpl"}}
{{/foreach}} {{/foreach}}