From c2bcd7be227b49255d704d7db564d990220ca1b4 Mon Sep 17 00:00:00 2001 From: Edwin Noorlander Date: Tue, 11 Aug 2026 18:06:17 +0200 Subject: [PATCH] System plugin support: admin menu items, admin routes, API integration - PluginManager: getAdminMenuItems(), handleAdminRoute(), getPluginType() - admin.php: load PluginManager, pass plugin_admin_menu to Twig - admin.php: route to plugin admin pages via handleAdminRoute() - admin.twig: show 'Plugins' sidebar section for system plugins - plugins-new.twig: choose content or system plugin type - handlePluginsNew: generate proper template based on type (content/system) - plugin-admin.twig: renders plugin output in admin layout - GeoIPInfo: example system plugin (admin page with GeoIP info) - System plugins: getAdminMenu(), getAdminRoutes(), handleAdminRoute() - Content plugins: getSidebarContent() (unchanged) --- admin/theme/default/assets/img/favicon.ico | Bin 32038 -> 41662 bytes admin/theme/default/views/layouts/admin.twig | 12 +++ .../default/views/pages/plugin-admin.twig | 7 ++ .../default/views/pages/plugins-new.twig | 17 +++- cms/core/plugin/PluginManager.php | 78 ++++++++++++++++++ plugins/GeoIPInfo/GeoIPInfo.php | 57 +++++++++++++ plugins/GeoIPInfo/plugin.json | 7 ++ public/admin.php | 44 +++++++++- themes/default/assets/img/favicon.ico | Bin 0 -> 41662 bytes themes/default/base.twig | 2 +- themes/favicon.ico | Bin 32038 -> 0 bytes 11 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 admin/theme/default/views/pages/plugin-admin.twig create mode 100644 plugins/GeoIPInfo/GeoIPInfo.php create mode 100644 plugins/GeoIPInfo/plugin.json create mode 100644 themes/default/assets/img/favicon.ico delete mode 100644 themes/favicon.ico diff --git a/admin/theme/default/assets/img/favicon.ico b/admin/theme/default/assets/img/favicon.ico index 78280bc367ee3e0debbd9e4c3dfbbc84653409c3..485452a2c7b8a3860995a704fbe2ce73127227ee 100644 GIT binary patch literal 41662 zcmeI4zmMEh5XXI4k}DE8Xd()dg#-{)qy#A3#lLV-}y5bA^`MI<7jK*O$}r2q;* zi0TLeB?1wF!msA&kdOc+|G+7T-xOQ$V}awG&)9x@&pzAl?XA7*#Pg!bd-G=A%)IZc zcRjYxK`_U^lP3fIzcYAmDF}83L2w_$RPYrf^U@xAD+u=Piz%AW{}cg5KoL*`6ahs* z5l{pa0YyL&Py`eKML-cy1QY>9KoL*`6ahs*5l{pa0YyL&Py`eKMW9v$!Z6$cor0DU zlJSl*r^pXNFG1&%{$QED%KQ)j%YD#QDBEO?Co0m7xjE>Sta8H3{9Jm4a=r+F-K|hw zE)sYnS?V}JaM}n9`qRGtRWFSIc)nhMsXcwltYUHt^ph>j8UM=MHnT>1KLo(+5cGcz zp4lm$5{nyxy;)%af7Gne-i-hlZiOxvV40oXOg=8UqfiZl0Dzy(f?mRBzps8S(KVuf z8OWoT+8hXg(_PS?1~^CmBl7I;dC|F5*3{FEP*e;8fc8-qxDx(}ENJK+DABh?SF&rB zPa^0#avf{MN#%>mDM8n+5>%E;8Tw2XIya`Il70T zqS{u@V;(WORrc7u3HlcDX_B)Cef*<$%*P-)ANtsH>0oCURD_=$$_pO0jDw=xDwHG7Dz&1#(jkucZ>vpqlvpqIGb~#GqYxMUQ`9ZcF^2w{1ljEea z?=Eb0p+6v>CNbVtw2!=b^rupb;O8En4OlvF=fx{?=sacV`3z4K*&25qXA{*LE`Qjc zN-ct)aWVY9D0Xa}gT`rvxh?XMH;=} zX4@?rqs))U@Kt*)f{!YXk9Wq*$Hd16{wk|AJn~U{Ey8~89TUTIMR8+i+}z5a zqHnt4uku>M6%0OWuSM{23G!)je)T|6%*dn$^tnbYzJ7sjF0$pCXKgLDhKJwUYZ3Og z8}d0%ebFP{N3pdEl{Gm}KkTwqCTD#uwMLmwk>PhLwFrLhhQ5LF+K@@PZsPSk1$vSb z`TXZKIew0~_FX1teHW^&)+qBWGJH>~7Ln^$k3(-lpFr?}?lP zf06XUr|$V=*ZJ_+sI}H`#en~*)FQ4pnji;@Wag*i=ShjF;#M3#P&VwG5c;}KBiKO%o_VV|Ky`_-&YbRaZRNb z$-`vUbL_n_zvl)EVmbi%v>WajEjHbl^Iek<>4~egwFrA}L_L_v#~Ggk1f3i587=lT z)9WR6E|TM;?X^gkoXqTcVm2R1PFh=wB>R`^oW9Nb*`7SCedY+HwY5l+kD1($D#{J{ zXl*TGFad+9->)^k^LpZGZ7pK(0E4ML&tQBO^~BQJTEt)i292soh^Mu+h?SGZ)FkAi z)wPI~lSb4ecQIn99*4H9dPG(+{kPodzOhV|vW2Q9;{+eYtOvP?`g#PLy2=NBe&be${)i>=UQPfSMdBdcnA_?24ZHxK_; ztMb`&J76*P`}(Tf6aIZ_k=EoxumuyJnxyjYtHk$ykK^Nfm7js8+X4@HzVT`aE+U)w zZ-t6*!1f0vzUBQvh3~y6vU$DFv*&$KUQT3g!~2k{+%NX!^YA59KoL*` z6ahs*5l{pa0YyL&Py`eKML-cy1QY>9KoL*`6aht`xd?Edf7AwqIbs+n?}Nwc!b$>K zjMs3!zZg%%{GgNNgRU)K>7@DPjr@YG-|zI({Ct`Z7MABN{k08zcexXW{czBY;#&>6 zEAT;YWg+5+!6N)xu(&**@V%8e_-?-w@q?f@me=@-VRE%UQmIytlr--$A*z zZaReWITux9NS-IJnZ5=%8&G>#d5=`+y{?qL {% block title %}CodePress Admin{% endblock %} + @@ -124,6 +125,17 @@ {% endif %} {% endif %} + {% if plugin_admin_menu is not empty %} +
  • Plugins
    • + {% for item in plugin_admin_menu %} +
  • + + {{ item.label }} + +
    • + {% endfor %} + {% endif %} + {% if has_permission('guide') %}
  • Help
  • diff --git a/admin/theme/default/views/pages/plugin-admin.twig b/admin/theme/default/views/pages/plugin-admin.twig new file mode 100644 index 0000000..1b32e34 --- /dev/null +++ b/admin/theme/default/views/pages/plugin-admin.twig @@ -0,0 +1,7 @@ +{% extends "layouts/admin.twig" %} + +{% block title %}{{ route|capitalize }} - CodePress Admin{% endblock %} + +{% block content %} +{{ plugin_content|raw }} +{% endblock %} \ No newline at end of file diff --git a/admin/theme/default/views/pages/plugins-new.twig b/admin/theme/default/views/pages/plugins-new.twig index 22ee7fa..5cca831 100644 --- a/admin/theme/default/views/pages/plugins-new.twig +++ b/admin/theme/default/views/pages/plugins-new.twig @@ -13,6 +13,21 @@ Alleen letters, cijfers, underscores en streepjes. +
    + +
    + + +
    +
    + + +
    +
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/cms/core/plugin/PluginManager.php b/cms/core/plugin/PluginManager.php index c334b75..92f3cd5 100644 --- a/cms/core/plugin/PluginManager.php +++ b/cms/core/plugin/PluginManager.php @@ -227,4 +227,82 @@ class PluginManager } return $urls; } + + /** + * Get admin menu items from system plugins. + * Each system plugin can register admin menu items via getAdminMenu(). + * Returns an array of [label, route, icon] tuples. + * + * @return array Admin menu items + */ + public function getAdminMenuItems(): array + { + $items = []; + foreach ($this->plugins as $pluginName => $plugin) { + // Only system plugins provide admin menu items + if (method_exists($plugin, 'getConfig')) { + $config = $plugin->getConfig(); + if (($config['type'] ?? 'content') !== 'system') { + continue; + } + } + + if (method_exists($plugin, 'getAdminMenu')) { + $menuItems = $plugin->getAdminMenu(); + if (is_array($menuItems)) { + foreach ($menuItems as $item) { + $items[] = $item; + } + } + } + } + return $items; + } + + /** + * Handle an admin route for a system plugin. + * Called when a route matches a plugin's registered admin route. + * Returns the rendered content string, or null if no plugin handled it. + * + * @param string $route The admin route + * @return string|null Rendered content or null if not handled + */ + public function handleAdminRoute(string $route): ?string + { + foreach ($this->plugins as $pluginName => $plugin) { + if (method_exists($plugin, 'getConfig')) { + $config = $plugin->getConfig(); + if (($config['type'] ?? 'content') !== 'system') { + continue; + } + } + + if (method_exists($plugin, 'getAdminRoutes')) { + $routes = $plugin->getAdminRoutes(); + if (is_array($routes) && in_array($route, $routes, true)) { + ob_start(); + $plugin->handleAdminRoute($route); + return ob_get_clean(); + } + } + } + return null; + } + + /** + * Get a plugin's type (content or system). + * + * @param string $pluginName Plugin name + * @return string 'content', 'system', or 'content' if unknown + */ + public function getPluginType(string $pluginName): string + { + $pluginDir = $this->pluginsPath . '/' . $pluginName; + $jsonFile = $pluginDir . '/plugin.json'; + if (file_exists($jsonFile)) { + $data = json_decode(file_get_contents($jsonFile), true); + return $data['type'] ?? 'content'; + } + return 'content'; + } } diff --git a/plugins/GeoIPInfo/GeoIPInfo.php b/plugins/GeoIPInfo/GeoIPInfo.php new file mode 100644 index 0000000..71d8d69 --- /dev/null +++ b/plugins/GeoIPInfo/GeoIPInfo.php @@ -0,0 +1,57 @@ +api = $api; + } + + public function getConfig(): array + { + return [ + 'title' => 'GeoIP Info', + 'type' => 'system', + ]; + } + + /** + * Register admin menu items. + */ + public function getAdminMenu(): array + { + return [ + ['label' => 'GeoIP Info', 'route' => 'geoip-info', 'icon' => 'bi-globe2'], + ]; + } + + /** + * Register admin routes this plugin handles. + */ + public function getAdminRoutes(): array + { + return ['geoip-info']; + } + + /** + * Handle admin route — render the admin page. + */ + public function handleAdminRoute(string $route): void + { + $ip = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; + $geoip = new GeoIP(); + $countryCode = $geoip->lookupCountry($ip); + $country = GeoIP::getCountryName($countryCode); + $flag = GeoIP::getCountryFlagEmoji($countryCode); + + echo '

    GeoIP Info

    '; + echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    IP adres' . htmlspecialchars($ip) . '
    Land' . $flag . ' ' . htmlspecialchars($country) . '
    '; + echo '
    '; + } +} \ No newline at end of file diff --git a/plugins/GeoIPInfo/plugin.json b/plugins/GeoIPInfo/plugin.json new file mode 100644 index 0000000..1a73324 --- /dev/null +++ b/plugins/GeoIPInfo/plugin.json @@ -0,0 +1,7 @@ +{ + "name": "GeoIPInfo", + "version": "1.0.0", + "author": "CodePress", + "description": "Systeem plugin voor GeoIP informatie in admin", + "type": "system" +} \ No newline at end of file diff --git a/public/admin.php b/public/admin.php index c24b32c..f47e534 100644 --- a/public/admin.php +++ b/public/admin.php @@ -27,6 +27,8 @@ require_once __DIR__ . '/../cms/core/class/Cache.php'; require_once __DIR__ . '/../cms/core/class/GeoIP.php'; require_once __DIR__ . '/../cms/core/class/Analytics.php'; require_once __DIR__ . '/../cms/core/class/LogManager.php'; +require_once __DIR__ . '/../cms/core/plugin/CMSAPI.php'; +require_once __DIR__ . '/../cms/core/plugin/PluginManager.php'; // Initialize dynamic logging from site config $siteConfigForLogging = file_exists($appConfig['config_json']) @@ -62,6 +64,15 @@ $twig->addFunction(new \Twig\TwigFunction('role_label', function($role) { return AdminAuth::getRoleLabel($role); })); +// Initialize PluginManager for admin (system plugins provide admin menu items) +$siteConfigForPlugins = file_exists($appConfig['config_json']) + ? (json_decode(file_get_contents($appConfig['config_json']), true) ?? []) + : []; +$enabledPluginsList = $siteConfigForPlugins['plugins']['enabled'] ?? $siteConfigForPlugins['enabled_plugins'] ?? []; +$adminPluginManager = new PluginManager(__DIR__ . '/../plugins', $enabledPluginsList); +$pluginAdminMenuItems = $adminPluginManager->getAdminMenuItems(); +$twig->addGlobal('plugin_admin_menu', $pluginAdminMenuItems); + // Routing $route = $_GET['route'] ?? ''; @@ -247,7 +258,22 @@ switch ($route) { break; default: - handleDashboard($auth, $appConfig, $twig, $user, $csrf, $siteConfig); + // Check if a system plugin handles this route + $pluginContent = $adminPluginManager->handleAdminRoute($route); + if ($pluginContent !== null) { + echo $twig->render('pages/plugin-admin.twig', [ + 'user' => $user, + 'route' => $route, + 'csrf_token' => $csrf, + 'sidebar_color' => getSidebarColor($appConfig), + 'needs_editor' => false, + 'message' => '', + 'message_type' => 'info', + 'plugin_content' => $pluginContent, + ]); + } else { + handleDashboard($auth, $appConfig, $twig, $user, $csrf, $siteConfig); + } } // ============================================================================ @@ -1109,6 +1135,10 @@ function handlePluginsNew($auth, $config, $twig, $user, $csrf): void $messageType = 'danger'; } else { $pluginName = trim($_POST['name'] ?? ''); + $pluginType = $_POST['type'] ?? 'content'; + if (!in_array($pluginType, ['content', 'system'], true)) { + $pluginType = 'content'; + } if (!empty($pluginName)) { $pluginName = preg_replace('/[^a-zA-Z0-9_-]/', '-', $pluginName); $pluginsDir = $config['plugins_dir']; @@ -1121,11 +1151,19 @@ function handlePluginsNew($auth, $config, $twig, $user, $csrf): void 'name' => ucfirst($pluginName), 'version' => '1.0.0', 'author' => $user['username'], + 'type' => $pluginType, ]; file_put_contents($newPluginDir . '/plugin.json', json_encode($pluginJson, JSON_PRETTY_PRINT)); - file_put_contents($newPluginDir . '/' . $pluginName . '.php', "api = \$api;\n }\n\n public function getConfig(): array\n {\n return ['title' => ucfirst('$pluginName'), 'type' => 'system'];\n }\n\n // Register admin menu items\n public function getAdminMenu(): array\n {\n return [\n ['label' => ucfirst('$pluginName'), 'route' => '" . strtolower($pluginName) . "', 'icon' => 'bi-gear'],\n ];\n }\n\n // Register admin routes this plugin handles\n public function getAdminRoutes(): array\n {\n return ['" . strtolower($pluginName) . "'];\n }\n\n // Handle admin route\n public function handleAdminRoute(string \$route): void\n {\n // Render your admin page here\n echo '

    " . ucfirst($pluginName) . "

    Systeem plugin admin pagina.

    ';\n }\n}\n"; + } else { + $template = "api = \$api;\n }\n\n public function getConfig(): array\n {\n return ['title' => ucfirst('$pluginName'), 'type' => 'content'];\n }\n\n public function getSidebarContent(): string\n {\n return '

    " . ucfirst($pluginName) . " sidebar content.

    ';\n }\n}\n"; + } + file_put_contents($newPluginDir . '/' . $pluginName . '.php', $template); + + adminLog($config, 'info', $user['username'] . ' creëerde ' . $pluginType . ' plugin ' . $pluginName); header('Location: /admin/plugins-edit?plugin=' . urlencode($pluginName)); exit; } else { diff --git a/themes/default/assets/img/favicon.ico b/themes/default/assets/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..485452a2c7b8a3860995a704fbe2ce73127227ee GIT binary patch literal 41662 zcmeI4zmMEh5XXI4k}DE8Xd()dg#-{)qy#A3#lLV-}y5bA^`MI<7jK*O$}r2q;* zi0TLeB?1wF!msA&kdOc+|G+7T-xOQ$V}awG&)9x@&pzAl?XA7*#Pg!bd-G=A%)IZc zcRjYxK`_U^lP3fIzcYAmDF}83L2w_$RPYrf^U@xAD+u=Piz%AW{}cg5KoL*`6ahs* z5l{pa0YyL&Py`eKML-cy1QY>9KoL*`6ahs*5l{pa0YyL&Py`eKMW9v$!Z6$cor0DU zlJSl*r^pXNFG1&%{$QED%KQ)j%YD#QDBEO?Co0m7xjE>Sta8H3{9Jm4a=r+F-K|hw zE)sYnS?V}JaM}n9`qRGtRWFSIc)nhMsXcwltYUHt^ph>j8UM=MHnT>1KLo(+5cGcz zp4lm$5{nyxy;)%af7Gne-i-hlZiOxvV40oXOg=8UqfiZl0Dzy(f?mRBzps8S(KVuf z8OWoT+8hXg(_PS?1~^CmBl7I;dC|F5*3{FEP*e;8fc8-qxDx(}ENJK+DABh?SF&rB zPa^0#avf{MN#%>mDM8n+5>%E;8Tw2XIya`Il70T zqS{u@V;(WORrc7u3HlcDX_B)Cef*<$%*P-)ANtsH>0oCURD_=$$_pO0jDw=xDwHG7Dz&1#(jkucZ>vpqlvpqIGb~#GqYxMUQ`9ZcF^2w{1ljEea z?=Eb0p+6v>CNbVtw2!=b^rupb;O8En4OlvF=fx{?=sacV`3z4K*&25qXA{*LE`Qjc zN-ct)aWVY9D0Xa}gT`rvxh?XMH;=} zX4@?rqs))U@Kt*)f{!YXk9Wq*$Hd16{wk|AJn~U{Ey8~89TUTIMR8+i+}z5a zqHnt4uku>M6%0OWuSM{23G!)je)T|6%*dn$^tnbYzJ7sjF0$pCXKgLDhKJwUYZ3Og z8}d0%ebFP{N3pdEl{Gm}KkTwqCTD#uwMLmwk>PhLwFrLhhQ5LF+K@@PZsPSk1$vSb z`TXZKIew0~_FX1teHW^&)+qBWGJH>~7Ln^$k3(-lpFr?}?lP zf06XUr|$V=*ZJ_+sI}H`#en~*)FQ4pnji;@Wag*i=ShjF;#M3#P&VwG5c;}KBiKO%o_VV|Ky`_-&YbRaZRNb z$-`vUbL_n_zvl)EVmbi%v>WajEjHbl^Iek<>4~egwFrA}L_L_v#~Ggk1f3i587=lT z)9WR6E|TM;?X^gkoXqTcVm2R1PFh=wB>R`^oW9Nb*`7SCedY+HwY5l+kD1($D#{J{ zXl*TGFad+9->)^k^LpZGZ7pK(0E4ML&tQBO^~BQJTEt)i292soh^Mu+h?SGZ)FkAi z)wPI~lSb4ecQIn99*4H9dPG(+{kPodzOhV|vW2Q9;{+eYtOvP?`g#PLy2=NBe&be${)i>=UQPfSMdBdcnA_?24ZHxK_; ztMb`&J76*P`}(Tf6aIZ_k=EoxumuyJnxyjYtHk$ykK^Nfm7js8+X4@HzVT`aE+U)w zZ-t6*!1f0vzUBQvh3~y6vU$DFv*&$KUQT3g!~2k{+%NX!^YA59KoL*` z6ahs*5l{pa0YyL&Py`eKML-cy1QY>9KoL*`6aht`xd?Edf7AwqIbs+n?}Nwc!b$>K zjMs3!zZg%%{GgNNgRU)K>7@DPjr@YG-|zI({Ct`Z7MABN{k08zcexXW{czBY;#&>6 zEAT;YWg+5+!6N)xu(&**@V%8e_-?-w@q?f@me=@-VRE%UQmIytlr--$A*z zZaReWITux9NS-IJnZ5=%8&G>#d5=`+y{?qL - + diff --git a/themes/favicon.ico b/themes/favicon.ico deleted file mode 100644 index 78280bc367ee3e0debbd9e4c3dfbbc84653409c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 zcmeI*F^a-K6b9g5uokPWQ>