Merge branch '2.4RC'2.4

1 files changed, 197 insertions, 50 deletions

diff --git a/include/nav.php b/include/nav.php
index 144509cd0..849e19d9a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -2,6 +2,10 @@
 
 use \Zotlabs\Lib as Zlib;
 
+require_once('include/security.php');
+require_once('include/menu.php');
+
+
 function nav() {
 
 	/**
@@ -36,14 +40,15 @@ EOT;
 	}
 	elseif(remote_channel())
 		$observer = App::get_observer();
-	
+
+	require_once('include/conversation.php');
+	$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
+	$channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']);
 
 	$myident = (($channel) ? $channel['xchan_addr'] : '');
 		
 	$sitelocation = (($myident) ? $myident : App::get_hostname());
 
-
-
 	/**
 	 *
 	 * Provide a banner/logo/whatever
@@ -55,10 +60,9 @@ EOT;
 	if($banner === false) 
 		$banner = get_config('system','sitename');
 
+	//the notifications template is in hdr.tpl
 	App::$page['header'] .= replace_macros(get_markup_template('hdr.tpl'), array(
-        '$baseurl' => z_root(),
-		'$sitelocation' => $sitelocation,
-		'$banner' =>  $banner
+		//we could additionally use this to display important system notifications e.g. for updates
 	));
 
 	$server_role = get_config('system','server_role');
@@ -66,21 +70,21 @@ EOT;
 	$techlevel = get_account_techlevel();
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
-	$nav = Array();
+	$nav = [];
 
 	/**
 	 * Display login or logout
 	 */	
 
-	$nav['usermenu']=array();
+	$nav['usermenu'] = [];
 	$userinfo = null;
-	$nav['loginmenu']=array();
+	$nav['loginmenu'] = [];
 
 	if($observer) {
-			$userinfo = array(
+		$userinfo = [
 			'icon' => $observer['xchan_photo_m'],
 			'name' => $observer['xchan_addr'],
-		);
+		];
 	}
 
 	elseif(! $_SESSION['authenticated']) {
@@ -96,38 +100,21 @@ EOT;
 		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! $basic))
 			$nav['channels'] = $chans;
 
-		$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn');
+		$nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
 		
 		// user menu
-		//$nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'),'channel_nav_btn');
-		$nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn');
+		$nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn'];
+
 		if(feature_enabled(local_channel(),'multi_profiles') && (! $basic))
-			$nav['usermenu'][]   = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn');
+			$nav['usermenu'][]   = ['profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn'];
 		else
-			$nav['usermenu'][]   = Array('profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn');
-
-		//$nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos'),'photos_nav_btn');
-		//$nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files'),'cloud_nav_btn');
-
-		//if((! $basic) && feature_enabled(local_channel(),'ajaxchat'))
-		//	$nav['usermenu'][] = Array('chat/' . $channel['channel_address'], t('Chat'),"",t('Your chatrooms'),'chat_nav_btn');
+			$nav['usermenu'][]   = ['profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn'];
 
-
-		//require_once('include/menu.php');
-		//$has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
-		//if(($has_bookmarks) && (! $basic)) {
-		//	$nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'),'bookmarks_nav_btn');
-		//}
-
-		//if(feature_enabled($channel['channel_id'],'webpages') && (! $basic))
-		//	$nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'),'webpages_nav_btn');
-		//if(feature_enabled($channel['channel_id'],'wiki') && (! $basic))
-		//	$nav['usermenu'][] = Array('wiki/' . $channel['channel_address'],t('Wikis'),"",t('Your wikis'),'wiki_nav_btn');
 	}
 	else {
 		if(! get_account_id())  {
 			$nav['login'] = login(true,'main-login',false,false);
-			$nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn');
+			$nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn'];
 			App::$page['content'] .= replace_macros(get_markup_template('nav_login.tpl'),
 				[ 
 					'$nav' => $nav,
@@ -137,7 +124,7 @@ EOT;
 
 		}
 		else
-			$nav['alogout'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn');
+			$nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
 
 
 	}
@@ -152,14 +139,14 @@ EOT;
 	if(! local_channel()) {
 		$nav['rusermenu'] = array(
 			$homelink,
-			t('Get me home'),
+			t('Take me home'),
 			'logout',
 			t('Log me out of this site')
 		);
 	}
 
 	if(((get_config('system','register_policy') == REGISTER_OPEN) || (get_config('system','register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated']))
-		$nav['register'] = array('register',t('Register'), "", t('Create an account'),'register_nav_btn');
+		$nav['register'] = ['register',t('Register'), "", t('Create an account'),'register_nav_btn'];
 
 	if(! get_config('system','hide_help')) {
 		$help_url = z_root() . '/help?f=&cmd=' . App::$cmd;
@@ -171,15 +158,10 @@ EOT;
 			//point directly to /help if $context_help is empty - this can be removed once we have context help for all modules
 			$enable_context_help = (($context_help) ? true : false);
 		}
-		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help);
+		$nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help];
 	}
 
-	if(! $basic)
-		$nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'),'apps_nav_btn');
-
-	$nav['search'] = array('search', t('Search'), "", t('Search site @name, #tag, ?docs, content'));
-
-	$nav['directory'] = array('directory', t('Directory'), "", t('Channel Directory'),'directory_nav_btn'); 
+	$nav['search'] = ['search', t('Search'), "", t('Search site @name, #tag, ?docs, content')];
 
 
 	/**
@@ -246,15 +228,13 @@ EOT;
 		$banner = get_config('system','sitename');
 
 	$x = array('nav' => $nav, 'usermenu' => $userinfo );
+
 	call_hooks('nav', $x);
 
 	// Not sure the best place to put this on the page. So I'm implementing it but leaving it 
 	// turned off until somebody discovers this and figures out a good location for it. 
 	$powered_by = '';
 
-	// $powered_by = '<strong>red<img class="smiley" src="' . z_root() . '/images/rm-16.png" alt="r#" />matrix</strong>';
-
-
 	//app bin
 	if(local_channel()) {
 		if(get_pconfig(local_channel(), 'system','initial_import_system_apps') === false) {
@@ -278,7 +258,7 @@ EOT;
 	usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
 
 	foreach($syslist as $app) {
-		$navapps[] = Zlib\Apps::app_render($app,'nav');
+		$nav_apps[] = Zlib\Apps::app_render($app,'nav');
 	}
 
 	$tpl = get_markup_template('nav.tpl');
@@ -296,8 +276,10 @@ EOT;
 		'$powered_by' => $powered_by,
 		'$help' => t('@name, #tag, ?doc, content'),
 		'$pleasewait' => t('Please wait...'),
-		'$navapps' => $navapps,
-		'$addapps' => t('Add Apps')
+		'$nav_apps' => $nav_apps,
+		'$channel_apps' => $channel_apps,
+		'$addapps' => t('Add Apps'),
+		'$sysapps_toggle' => t('Toggle System Apps')
 	));
 
 	if(x($_SESSION, 'reload_avatar') && $observer) {
@@ -336,3 +318,168 @@ function nav_set_selected($item){
 	);
 	App::$nav_sel[$item] = 'active';
 }
+
+
+
+function channel_apps($is_owner = false, $nickname = null) {
+
+	// Don't provide any channel apps if we're running as the sys channel
+
+	if(App::$is_sys)
+		return '';
+
+	if(! get_pconfig($uid, 'system', 'channelapps','1'))
+		return '';
+
+	$channel = App::get_channel();
+
+	if($channel && is_null($nickname))
+		$nickname = $channel['channel_address'];
+
+	$uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel());
+	$account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']);
+
+	if($uid == local_channel()) {
+		return;
+	}
+	else {
+		$cal_link = '/cal/' . $nickname;
+	}
+
+	$sql_options = item_permissions_sql($uid);
+
+	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+		where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' 
+		and item.item_delayed = 0 and item.item_deleted = 0 
+		and ( iconfig.k = 'WEBPAGE' and item_type = %d ) 
+		$sql_options limit 1",
+		intval($uid),
+		dbesc('home'),
+		intval(ITEM_TYPE_WEBPAGE)
+	);
+
+	$has_webpages = (($r) ? true : false);
+
+	if(x($_GET, 'tab'))
+		$tab = notags(trim($_GET['tab']));
+
+	$url = z_root() . '/channel/' . $nickname;
+	$pr  = z_root() . '/profile/' . $nickname;
+
+	$tabs = [
+		[
+			'label' => t('Channel'),
+			'url'   => $url,
+			'sel'   => ((argv(0) == 'channel') ? 'active' : ''),
+			'title' => t('Status Messages and Posts'),
+			'id'    => 'status-tab',
+			'icon'  => 'home'
+		],
+	];
+
+	$p = get_all_perms($uid,get_observer_hash());
+
+	if ($p['view_profile']) {
+		$tabs[] = [
+			'label' => t('About'),
+			'url'   => $pr,
+			'sel'   => ((argv(0) == 'profile') ? 'active' : ''),
+			'title' => t('Profile Details'),
+			'id'    => 'profile-tab',
+			'icon'  => 'user'
+		];
+	}
+	if ($p['view_storage']) {
+		$tabs[] = [
+			'label' => t('Photos'),
+			'url'   => z_root() . '/photos/' . $nickname,
+			'sel'   => ((argv(0) == 'photos') ? 'active' : ''),
+			'title' => t('Photo Albums'),
+			'id'    => 'photo-tab',
+			'icon'  => 'photo'
+		];
+		$tabs[] = [
+			'label' => t('Files'),
+			'url'   => z_root() . '/cloud/' . $nickname,
+			'sel'   => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''),
+			'title' => t('Files and Storage'),
+			'id'    => 'files-tab',
+			'icon'  => 'folder-open'
+		];
+	}
+
+	if($p['view_stream'] && $cal_link) {
+		$tabs[] = [
+			'label' => t('Events'),
+			'url'   => z_root() . $cal_link,
+			'sel'   => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''),
+			'title' => t('Events'),
+			'id'    => 'event-tab',
+			'icon'  => 'calendar'
+		];
+	}
+
+
+	if ($p['chat'] && feature_enabled($uid,'ajaxchat')) {
+		$has_chats = ZLib\Chatroom::list_count($uid);
+		if ($has_chats) {
+			$tabs[] = [
+				'label' => t('Chatrooms'),
+				'url'   => z_root() . '/chat/' . $nickname,
+				'sel'   => ((argv(0) == 'chat') ? 'active' : '' ),
+				'title' => t('Chatrooms'),
+				'id'    => 'chat-tab',
+				'icon'  => 'comments-o'
+			];
+		}
+	}
+
+	$has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
+	if ($is_owner && $has_bookmarks) {
+		$tabs[] = [
+			'label' => t('Bookmarks'),
+			'url'   => z_root() . '/bookmarks',
+			'sel'   => ((argv(0) == 'bookmarks') ? 'active' : ''),
+			'title' => t('Saved Bookmarks'),
+			'id'    => 'bookmarks-tab',
+			'icon'  => 'bookmark'
+		];
+	}
+
+	if($has_webpages && feature_enabled($uid,'webpages')) {
+		$tabs[] = [
+			'label' => t('Webpages'),
+			'url'   => z_root() . '/page/' . $nickname . '/home',
+			'sel'   => ((argv(0) == 'webpages') ? 'active' : ''),
+			'title' => t('View Webpages'),
+			'id'    => 'webpages-tab',
+			'icon'  => 'newspaper-o'
+		];
+	}
+ 
+
+	if ($p['view_wiki']) {
+		if(feature_enabled($uid,'wiki') && (get_account_techlevel($account_id) > 3)) {
+			$tabs[] = [
+				'label' => t('Wikis'),
+				'url'   => z_root() . '/wiki/' . $nickname,
+				'sel'   => ((argv(0) == 'wiki') ? 'active' : ''),
+				'title' => t('Wiki'),
+				'id'    => 'wiki-tab',
+				'icon'  => 'pencil-square-o'
+			];
+		}
+	}
+
+	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+	call_hooks('profile_tabs', $arr);
+	call_hooks('channel_apps', $arr);	
+
+	return replace_macros(get_markup_template('profile_tabs.tpl'), 
+		[
+			'$tabs'  => $arr['tabs'],
+			'$name'  => App::$profile['channel_name'],
+			'$thumb' => App::$profile['thumb']
+		]
+	);
+}