From d8558366aa48486c08e0c69fb0f739b29b3fadc2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 26 Apr 2015 22:16:38 +0200 Subject: [PATCH] Redefined the conditions when notifications and introductions are shown. --- include/items.php | 5 +---- include/nav.php | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/items.php b/include/items.php index ff31e84f7c..279169e506 100644 --- a/include/items.php +++ b/include/items.php @@ -4110,9 +4110,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { } if(($r[0]['notify-flags'] & NOTIFY_INTRO) && - (($r[0]['page-flags'] == PAGE_NORMAL) OR ($r[0]['page-flags'] == PAGE_SOAPBOX))) { - - + in_array($r[0]['page-flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) { notification(array( 'type' => NOTIFY_INTRO, @@ -4129,7 +4127,6 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { 'otype' => 'intro' )); - } } } diff --git a/include/nav.php b/include/nav.php index 9ea3b4b7f5..df5e00394e 100644 --- a/include/nav.php +++ b/include/nav.php @@ -147,15 +147,16 @@ function nav_info(&$a) { $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); - - /* only show friend requests for normal pages. Other page types have automatic friendship. */ - - if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_SOAPBOX || $_SESSION['page_flags'] == PAGE_PRVGROUP) { - $nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests')); - $nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications')); - $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); - $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); - + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP))) { + /* only show friend requests for normal pages. Other page types have automatic friendship. */ + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_PRVGROUP))) + $nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests')); + + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) { + $nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications')); + $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); + $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); + } } $nav['messages'] = array('message', t('Messages'), "", t('Private mail')); -- 2.39.5