Move addon admin list generation to Core\Addon

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 4dd34eb16f01eab73f1ab9356f9d7b241523c5bb..b6f64ad7422f4a451672b4e8cb2d06769c1a691b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -27,6 +27,14 @@ class Addon extends BaseObject
         */
        private static $addons = [];
 
+       /**
+        * Returns the list of available addons with their current status and info.
+        * This list is made from scanning the addon/ folder.
+        * Unsupported addons are excluded unless they already are enabled or system.show_unsupported_addon is set.
+        *
+        * @return array
+        * @throws \Exception
+        */
        public static function getAvailableList()
        {
                $addons = [];
@@ -50,6 +58,30 @@ class Addon extends BaseObject
                return $addons;
        }
 
+       /**
+        * Returns a list of addons that can be configured at the node level.
+        * The list is formatted for display in the admin panel aside.
+        *
+        * @return array
+        * @throws \Exception
+        */
+       public static function getAdminList()
+       {
+               $addons_admin = [];
+               $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);
+               while ($addon = DBA::fetch($addonsAdminStmt)) {
+                       $addons_admin[$addon['name']] = [
+                               'url' => 'admin/addons/' . $addon['name'],
+                               'name' => $addon['name'],
+                               'class' => 'addon'
+                       ];
+               }
+               DBA::close($addonsAdminStmt);
+
+               return $addons_admin;
+       }
+
+
        /**
         * @brief Synchronize addons:
         *

diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 9ef2035dec2bb8808df0e9e20d6725c00647c993..25e538122ce214fa960e52f322a44080139b5f3a 100644 (file)
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -6,7 +6,6 @@ use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;\r
 use Friendica\Core\L10n;\r
 use Friendica\Core\Renderer;\r
-use Friendica\Database\DBA;\r
 use Friendica\Module\BaseAdminModule;\r
 use Friendica\Util\Strings;\r
 \r
@@ -42,13 +41,7 @@ class Details extends BaseAdminModule
 \r
                $a = self::getApp();\r
 \r
-               $addons_admin = [];\r
-               $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);\r
-               foreach (DBA::toArray($addonsAdminStmt) as $addon) {\r
-                       $addonName = $addon['name'];\r
-                       // temp addons with admin\r
-                       $addons_admin[] = $addonName;\r
-               }\r
+               $addons_admin = Addon::getAdminList();\r
 \r
                if ($a->argc > 2) {\r
                        // @TODO: Replace with parameter from router\r
@@ -93,7 +86,7 @@ class Details extends BaseAdminModule
                        }\r
 \r
                        $admin_form = '';\r
-                       if (in_array($addon, $addons_admin)) {\r
+                       if (array_key_exists($addon, $addons_admin)) {\r
                                require_once "addon/$addon/$addon.php";\r
                                $func = $addon . '_addon_admin';\r
                                $func($a, $admin_form);\r
@@ -126,4 +119,4 @@ class Details extends BaseAdminModule
 \r
                $a->internalRedirect('admin/addons');\r
        }\r
-}
\ No newline at end of file
+}\r

diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 6c8d48dc494dcdae28217b510cb08969151c54a9..9df486c10e3cbbe0721f6d26c34f89be965ddead 100644 (file)
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -2,12 +2,9 @@
 \r
 namespace Friendica\Module\Admin\Addons;\r
 \r
-use Friendica\Content\Text\Markdown;\r
 use Friendica\Core\Addon;\r
-use Friendica\Core\Config;\r
 use Friendica\Core\L10n;\r
 use Friendica\Core\Renderer;\r
-use Friendica\Database\DBA;\r
 use Friendica\Module\BaseAdminModule;\r
 \r
 class Index extends BaseAdminModule\r
@@ -46,12 +43,6 @@ class Index extends BaseAdminModule
                        $a->internalRedirect('admin/addons');\r
                }\r
 \r
-               $addons_admin = [];\r
-               $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);\r
-               foreach (DBA::toArray($addonsAdminStmt) as $addon) {\r
-                       $addons_admin[] = $addon['name'];\r
-               }\r
-\r
                $addons = Addon::getAvailableList();\r
 \r
                $t = Renderer::getMarkupTemplate('admin/addons/index.tpl');\r

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 140f1223eeffaa536ce485e58a7fb9946e0dba51..5e56bd8d71a2d30f2763b4d37432b573255687ce 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -3,6 +3,7 @@
 namespace Friendica\Module;\r
 \r
 use Friendica\BaseModule;\r
+use Friendica\Core\Addon;\r
 use Friendica\Core\L10n;\r
 use Friendica\Core\Renderer;\r
 use Friendica\Core\System;\r
@@ -97,15 +98,9 @@ abstract class BaseAdminModule extends BaseModule
                        ]],\r
                ];\r
 \r
-               $addons_admin = [];\r
-               $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);\r
-               foreach (DBA::toArray($addonsAdminStmt) as $addon) {\r
-                       $addons_admin[] = ['admin/addons/' . $addon['name'], $addon['name'], 'addon'];\r
-               }\r
-\r
                $t = Renderer::getMarkupTemplate('admin/aside.tpl');\r
                $a->page['aside'] .= Renderer::replaceMacros($t, [\r
-                       '$admin' => ['addons_admin' => $addons_admin],\r
+                       '$admin' => ['addons_admin' => Addon::getAdminList()],\r
                        '$subpages' => $aside_sub,\r
                        '$admtxt' => L10n::t('Admin'),\r
                        '$plugadmtxt' => L10n::t('Addon Features'),\r

diff --git a/view/theme/frio/templates/admin/aside.tpl b/view/theme/frio/templates/admin/aside.tpl
index 5da73e135da84d819310f7b1a24cf9f19ff75456..0ba58e5aecaada0ada71d257aa91594c3dcf0ac2 100644 (file)
--- a/view/theme/frio/templates/admin/aside.tpl
+++ b/view/theme/frio/templates/admin/aside.tpl
@@ -43,9 +43,9 @@
        <h3>{{$plugadmtxt}}</h3>
        <ul role="menu">
                {{foreach $admin.addons_admin as $name => $item}}
-               <li role="menuitem" class="{{$item.2}}">
-                       <a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-                               {{$item.1}}
+               <li role="menuitem" class="{{$item.class}}">
+                       <a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
+                               {{$item.name}}
                        </a>
                </li>
                {{/foreach}}