tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center

This commit is contained in:
fbsanchez 2021-06-16 17:27:06 +02:00
parent b701b2be32 c6877154fb
commit b032beb559
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pandora_console/godmode/servers/plugin.php
View File

@ -112,7 +112,6 @@ $edit_file = get_parameter('edit_file', false);
$update_file = get_parameter('update_file', false);
$plugin_command = get_parameter('plugin_command', '');
$tab = get_parameter('tab', '');
$deploy_plugin = get_parameter('deploy_plugin', 0);
if ($view != '') {
$form_id = $view;
@ -826,19 +825,7 @@ if (($create != '') || ($view != '')) {
}
}
if ($deploy_plugin) {
if (is_metaconsole()) {
enterprise_include_once('include/functions_plugins.php');
$result = plugins_deploy_plugin($deploy_plugin);
if (!$result) {
ui_print_error_message(__('Problem deploying plugin'));
} else {
ui_print_success_message(__('Plugin deployed successfully'));
}
}
}
// If not edition or insert, then list available plugins
// If not edition or insert, then list available plugins.
$rows = db_get_all_rows_sql('SELECT * FROM tplugin ORDER BY name');
if ($rows !== false) {
@ -926,16 +913,6 @@ if (($create != '') || ($view != '')) {
'class' => 'invert_filter',
]
).'</a>';
if (is_metaconsole()) {
echo "&nbsp;&nbsp;&nbsp;<a href='index.php?sec=$sec&sec2=godmode/servers/plugin&tab=$tab&deploy_plugin=".$row['id'].'&tab=plugins&pure='.$config['pure']."'>".html_print_image(
'images/deploy.png',
true,
[
'title' => __('Deploy'),
'width' => '21 px',
]
).'</a>&nbsp;&nbsp;';
}
echo '</td>';
}

2
pandora_console/godmode/servers/plugin_registration.php
View File

@ -36,7 +36,7 @@ global $config;
check_login();
if ((bool) check_acl($config['id_user'], 0, 'PM') === false
&& (bool) check_acl($config['id_user'], 0, 'AW') === false
|| (bool) check_acl($config['id_user'], 0, 'AW') === false
) {
db_pandora_audit(
'ACL Violation',

6
pandora_console/include/functions_config.php
View File

@ -3251,12 +3251,6 @@ function config_process_config()
config_update_value('ehorus_req_timeout', 5);
}
if (is_metaconsole() === true) {
if (!isset($config['metaconsole_deploy_inventory_plugin'])) {
config_update_value('metaconsole_deploy_inventory_plugin', 0);
}
}
// Integria.
if (!isset($config['integria_user_level_conf'])) {
config_update_value('integria_user_level_conf', 0);