Merge pull request #6260 from annando/issue-6257

[friendica.git] / mod / apps.php

diff --git a/mod/apps.php b/mod/apps.php
index fea548367900feae81971606fd8331a9bd0ad1c7..d497ce93a2812c6695dbc160bd491c8734562c65 100644 (file)
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -1,23 +1,33 @@
 <?php
+/**
+ * @file mod/apps.php
+ */
+use Friendica\Content\Nav;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 
-function apps_content(App $a) {
-       $privateaddons = get_config('config','private_addons');
+function apps_content()
+{
+       $privateaddons = Config::get('config', 'private_addons');
        if ($privateaddons === "1") {
-               if ((! (local_user())))  {
-                       info( t("You must be logged in to use addons. "));
+               if (! local_user()) {
+                       info(L10n::t('You must be logged in to use addons. '));
                        return;
-               }
+               };
        }
 
-       $title = t('Applications');
+       $title = L10n::t('Applications');
 
-       if (count($a->apps) == 0) {
-               notice( t('No installed applications.') . EOL);
+       $apps = Nav::getAppMenu();
+
+       if (count($apps) == 0) {
+               notice(L10n::t('No installed applications.') . EOL);
        }
 
-       $tpl = get_markup_template("apps.tpl");
-       return replace_macros($tpl, array(
+       $tpl = Renderer::getMarkupTemplate('apps.tpl');
+       return Renderer::replaceMacros($tpl, [
                '$title' => $title,
-               '$apps' => $a->apps,
-       ));
+               '$apps'  => $apps,
+       ]);
 }