From 31ab8c1a3f35ce923ec8c701790ef3018cb12bdb Mon Sep 17 00:00:00 2001 From: zarzuelo <zarzuelo@gmail.com> Date: Fri, 8 Feb 2013 09:28:25 +0000 Subject: [PATCH] 2013-02-08 Sergio Martin <sergio.martin@artica.es> * godmode/servers/plugin.php: Prepare plugin manager to be used from metaconsole git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++ pandora_console/godmode/servers/plugin.php | 45 +++++++++++++++------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7bc478448b..eaaf49cd83 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-02-08 Sergio Martin <sergio.martin@artica.es> + + * godmode/servers/plugin.php: Prepare plugin manager to be used + from metaconsole + 2013-02-07 Ramon Novoa <rnovoa@artica.es> * operation/menu.php: Fixed the SNMP menu. diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 07e1ace789..3ae3c897f9 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -38,6 +38,8 @@ if (! check_acl ($config['id_user'], 0, "LM")) { return; } +enterprise_include_once ('meta/include/functions_components_meta.php'); + $view = get_parameter ("view", ""); $create = get_parameter ("create", ""); @@ -68,20 +70,29 @@ if ($create != "") { // SHOW THE FORM // ================================================================= +$sec = 'gservers'; + if (($create != "") OR ($view != "")) { - if ($create != "") - ui_print_page_header (__('Plugin creation') . ui_print_help_icon("plugin_definition", true), "", false, "", true); + if(defined('METACONSOLE')) { + components_meta_print_header(); + $sec = 'advanced'; + } else { - ui_print_page_header (__('Plugin update') . ui_print_help_icon("plugin_definition", true), "", false, "", true); - $plugin_id = get_parameter ("view",""); + if ($create != "") + ui_print_page_header (__('Plugin creation') . ui_print_help_icon("plugin_definition", true), "", false, "", true); + else { + ui_print_page_header (__('Plugin update') . ui_print_help_icon("plugin_definition", true), "", false, "", true); + } } - - if ($create == "") - echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&update_plugin=$plugin_id'>"; - else - echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&create_plugin=1'>"; + if ($create == "") { + $plugin_id = get_parameter ("view",""); + echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&update_plugin=$plugin_id&pure=" . $config['pure'] . "'>"; + } + else { + echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&create_plugin=1&pure=" . $config['pure'] . "'>"; + } $table->width = '98%'; $table->id = 'table-form'; @@ -274,7 +285,13 @@ if (($create != "") OR ($view != "")) { echo '</form></table>'; } else { - ui_print_page_header (__('Plugins registered in Pandora FMS'), "", false, "", true); + if(defined('METACONSOLE')) { + components_meta_print_header(); + $sec = 'advanced'; + } + else { + ui_print_page_header (__('Plugins registered in Pandora FMS'), "", false, "", true); + } // Update plugin if (isset($_GET["update_plugin"])){ // if modified any parameter @@ -425,7 +442,7 @@ else { } echo "<tr>"; echo "<td class=$tdcolor>"; - echo "<b><a href='index.php?sec=gservers&sec2=godmode/servers/plugin&view=".$row["id"]."'>"; + echo "<b><a href='index.php?sec=$sec&sec2=godmode/servers/plugin&view=".$row["id"]."&tab=plugins&pure=" . $config['pure'] . "'>"; echo $row["name"]; echo "</a></b></td>"; echo "<td class=$tdcolor>"; @@ -436,8 +453,8 @@ else { echo "</td><td class=$tdcolor>"; echo $row["execute"]; echo "</td><td class=$tdcolor>"; - echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&view=".$row["id"]."'>" . html_print_image('images/config.png', true, array("title" => __("Edit"))) . "</a> "; - echo "<a href='index.php?sec=gservers&sec2=godmode/servers/plugin&kill_plugin=".$row["id"]."'>" . html_print_image("images/cross.png", true, array("border" => '0')) . "</a>"; + echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&view=".$row["id"]."&tab=plugins&pure=" . $config['pure'] . "'>" . html_print_image('images/config.png', true, array("title" => __("Edit"))) . "</a> "; + echo "<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&kill_plugin=".$row["id"]."&tab=plugins&pure=" . $config['pure'] . "'>" . html_print_image("images/cross.png", true, array("border" => '0')) . "</a>"; echo "</td></tr>"; } echo "</table>"; @@ -448,7 +465,7 @@ else { } echo "<table width='98%'>"; echo "<tr><td align=right>"; - echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&create=1'>"; + echo "<form name=plugin method='post' action='index.php?sec=gservers&sec2=godmode/servers/plugin&create=1&pure=" . $config['pure'] . "'>"; echo "<input name='crtbutton' type='submit' class='sub next' value='".__('Add')."'>"; echo "</td></tr></table>"; }