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

introduce a connection type called 'ifpending' for number 6 of issue #395 - so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu

Browse Source
This commit is contained in:
friendica 2014-04-04 16:56:49 -07:00
parent 22cdfef216
commit 97f0424b18
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nav.php
View File

@ -162,7 +162,7 @@ EOT;
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
$nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections')); $nav['intros'] = array('connections/pending', t('Connections'), "", t('Connections'));
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications')); $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));

20
mod/connections.php
View File

@ -212,6 +212,26 @@ function connections_content(&$a) {
$pending = true; $pending = true;
nav_set_selected('intros'); nav_set_selected('intros');
break; break;
case 'ifpending':
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) and (abook_flags & %d) and not (abook_flags & %d)",
intval(local_user()),
intval(ABOOK_FLAG_SELF),
intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_IGNORED)
);
if($r && $r[0]['total']) {
$search_flags = ABOOK_FLAG_PENDING;
$head = t('New');
$pending = true;
nav_set_selected('intros');
}
else {
$head = t('All');
$search_flags = 0;
$all = true;
}
break;
case 'unconnected': case 'unconnected':
$search_flags = ABOOK_FLAG_UNCONNECTED; $search_flags = ABOOK_FLAG_UNCONNECTED;
$head = t('Unconnected'); $head = t('Unconnected');