From 24d1d752fe6707d8e19fc61b96bbd966457881f6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 11 Oct 2017 11:58:09 +0200
Subject: nav_set_selected() for apps and apporder. restrict apporder to
 local_channel() and whitespace

---
 Zotlabs/Module/Apporder.php | 43 ++++++++++++++++++++++++-------------------
 Zotlabs/Module/Apps.php     |  2 ++
 2 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php
index 1097a01eb..956548d1f 100644
--- a/Zotlabs/Module/Apporder.php
+++ b/Zotlabs/Module/Apporder.php
@@ -11,30 +11,35 @@ class Apporder extends \Zotlabs\Web\Controller {
 	}
 
 	function get() {
-       $syslist = array();
-        $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
-        if($list) {
-            foreach($list as $li) {
-                $syslist[] = Zlib\Apps::app_encode($li);
-            }
-        }
-        Zlib\Apps::translate_system_apps($syslist);
 
-	    usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+		if(! local_channel())
+			return;
 
-    	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+		nav_set_selected('Order Apps');
 
-	    foreach($syslist as $app) {
-    	    $nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
+		$syslist = array();
+		$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
+		if($list) {
+			foreach($list as $li) {
+				$syslist[] = Zlib\Apps::app_encode($li);
+			}
+		}
+		Zlib\Apps::translate_system_apps($syslist);
+
+		usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+
+		$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
 
+		foreach($syslist as $app) {
+			$nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
 		}
 
-	return replace_macros(get_markup_template('apporder.tpl'),
-		[
-			'$header' => t('Change Order of Navigation Apps'),
-			'$desc' => t('Use arrows to move the corresponding app up or down in the display list'),
-			'$nav_apps' => $nav_apps
-		]
-	);
+		return replace_macros(get_markup_template('apporder.tpl'),
+			[
+				'$header' => t('Change Order of Navigation Apps'),
+				'$desc' => t('Use arrows to move the corresponding app up or down in the display list'),
+				'$nav_apps' => $nav_apps
+			]
+		);
 	}
 }
diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php
index 261615997..2f61f2932 100644
--- a/Zotlabs/Module/Apps.php
+++ b/Zotlabs/Module/Apps.php
@@ -7,6 +7,8 @@ use \Zotlabs\Lib as Zlib;
 class Apps extends \Zotlabs\Web\Controller {
 
 	function get() {
+
+		nav_set_selected('Apps');
 	
 		if(argc() == 2 && argv(1) == 'edit')
 			$mode = 'edit';
-- 
cgit v1.2.3