aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-11 11:58:09 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-11 11:58:09 +0200
commit24d1d752fe6707d8e19fc61b96bbd966457881f6 (patch)
treecca07c9cfc9814a322c88567a916eb8710e94010
parentba55400f14c7930786785db13a18a6333c20ee7d (diff)
downloadvolse-hubzilla-24d1d752fe6707d8e19fc61b96bbd966457881f6.tar.gz
volse-hubzilla-24d1d752fe6707d8e19fc61b96bbd966457881f6.tar.bz2
volse-hubzilla-24d1d752fe6707d8e19fc61b96bbd966457881f6.zip
nav_set_selected() for apps and apporder. restrict apporder to local_channel() and whitespace
-rw-r--r--Zotlabs/Module/Apporder.php43
-rw-r--r--Zotlabs/Module/Apps.php2
2 files changed, 26 insertions, 19 deletions
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';