From 0b7588b1eb61053a92c71046a12c169300b7fff4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 29 Mar 2014 23:43:31 -0700
Subject: issue #384

---
 include/conversation.php | 63 +++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

(limited to 'include/conversation.php')

diff --git a/include/conversation.php b/include/conversation.php
index 342392398..294c7e3e3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1384,58 +1384,65 @@ function network_tabs() {
 	// tabs
 	$tabs = array();
 
-	if(get_config('system','discover_tab'))
+	if(get_config('system','discover_tab')) {
 		$tabs[] = array(
-                        'label' => t('Discover'),
-                        'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&fh=1' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
-                        'sel'=> $public_active,
-                        'title'=> t('Imported public streams'),
-                );
+			'label' => t('Discover'),
+			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&fh=1' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
+			'sel'=> $public_active,
+			'title'=> t('Imported public streams'),
+		);
+	}
 
-	array_push($tabs,
-		array(
-			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
-			'sel'=>$all_active,
-			'title'=> t('Sort by Comment Date'),
-		),
-		array(
-			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
-			'sel'=>$postord_active,
-			'title' => t('Sort by Post Date'),
-		),
-		array(
+	$tabs[] = array(
+		'label' => t('Commented Order'),
+		'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
+		'sel'=>$all_active,
+		'title'=> t('Sort by Comment Date'),
+	);
+	
+	$tabs[] = array(
+		'label' => t('Posted Order'),
+		'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 
+		'sel'=>$postord_active,
+		'title' => t('Sort by Post Date'),
+	);
+
+	if(feature_enabled(local_user(),'personal_tab')) {
+		$tabs[] = array(
 			'label' => t('Personal'),
 			'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1',
 			'sel' => $conv_active,
 			'title' => t('Posts that mention or involve you'),
-		),
-		array(
+		);
+	}
+
+	if(feature_enable(local_user(),'new_tab')) { 
+		$tabs[] = array(
 			'label' => t('New'),
 			'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
 			'sel' => $new_active,
 			'title' => t('Activity Stream - by date'),
-		)
-	);
+		);
+	}
 
-	if(feature_enabled(local_user(),'star_posts')) 
+	if(feature_enabled(local_user(),'star_posts')) {
 		$tabs[] = array(
 			'label' => t('Starred'),
 			'url'=>$a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
 			'sel'=>$starred_active,
 			'title' => t('Favourite Posts'),
 		);
-
+	}
 	// Not yet implemented
 
-	if(feature_enabled(local_user(),'spam_filter')) 
+	if(feature_enabled(local_user(),'spam_filter')) {
 		$tabs[] = array(
 			'label' => t('Spam'),
 			'url'=>$a->get_baseurl(true) . '/network?f=&spam=1',
 			'sel'=> $spam_active,
 			'title' => t('Posts flagged as SPAM'),
-		);	
+		);
+	}	
 
 	$arr = array('tabs' => $tabs);
 	call_hooks('network_tabs', $arr);
-- 
cgit v1.2.3