diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
| commit | b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch) | |
| tree | 718df6305bcb82c8dcb4b287a7132422e748cdfb /mod/apps.php | |
| parent | c2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff) | |
| parent | a92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff) | |
| download | volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2 volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/apps.php')
| -rw-r--r-- | mod/apps.php | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/mod/apps.php b/mod/apps.php index 43540a3de..07d1968d2 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -1,16 +1,36 @@ <?php +require_once('include/apps.php'); + function apps_content(&$a) { - $apps = $a->get_apps(); + if(argc() == 2 && argv(1) == 'edit') + $mode = 'edit'; + else + $mode = 'list'; + + $apps = array(); + + $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'); - if(count($apps) == 0) - notice( t('No installed applications.') . EOL); +// logger('apps: ' . print_r($syslist,true)); + foreach($syslist as $app) { + $apps[] = app_render($app,$mode); + } - $tpl = get_markup_template("apps.tpl"); - return replace_macros($tpl, array( - '$title' => t('Applications'), + return replace_macros(get_markup_template('myapps.tpl'), array( + '$title' => t('Apps'), '$apps' => $apps, )); |