aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-10 21:21:50 -0700
committerfriendica <info@friendica.com>2014-06-10 21:21:50 -0700
commit13ba9ef0037656b1e12d627f767fc2fc8781632a (patch)
treed447808b595ca2ae26e24ea7ec0646c2a625e000 /mod
parente41375c8892b547c4bb01cb07fc5b771a756fd6e (diff)
downloadvolse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.tar.gz
volse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.tar.bz2
volse-hubzilla-13ba9ef0037656b1e12d627f767fc2fc8781632a.zip
merge the app menus
Diffstat (limited to 'mod')
-rw-r--r--mod/apps.php37
1 files changed, 17 insertions, 20 deletions
diff --git a/mod/apps.php b/mod/apps.php
index e88c54c66..5cbf67b1f 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -4,33 +4,30 @@ require_once('include/apps.php');
function apps_content(&$a) {
-
- if(argc() == 1 || (! local_user())) {
-
- $apps = get_system_apps();
-
- // $o .= print_r($apps,true);
-
- // return $o;
-
- return replace_macros(get_markup_template('apps.tpl'), array(
- '$title' => t('Apps'),
- '$apps' => $apps,
- ));
- }
-
- if(argc() == 3 && argv(2) == 'edit')
+ if(argc() == 2 && argv(1) == 'edit')
$mode = 'edit';
else
$mode = 'list';
$apps = array();
- $list = app_list(local_user());
- if($list) {
- foreach($list as $app) {
- $apps[] = app_render(app_encode($app),$mode);
+
+ $syslist = get_system_apps();
+
+ if(local_user()) {
+ $list = app_list(local_user());
+ if($list) {
+ foreach($list as $x) {
+ $syslist[] = app_encode($x);
+ }
}
}
+ usort($syslist,'app_name_compare');
+
+ logger('apps: ' . print_r($syslist,true));
+
+ foreach($syslist as $app) {
+ $apps[] = app_render($app,$mode);
+ }
return replace_macros(get_markup_template('myapps.tpl'), array(
'$title' => t('Apps'),