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

2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp> 

* godmode/agentes/module_manager_editor.php,
	godmode/agentes/agent_manager.php,
	godmode/agentes/modificar_agente.php,
	include/functions_agents.php,
	include/functions_modules.php: Added missing enterprise_hook()
	wrapper calls.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-08-19 06:43:12 +00:00
parent f9191352bf
commit 296004499f
6 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php,
godmode/agentes/agent_manager.php,
godmode/agentes/modificar_agente.php,
include/functions_agents.php,
include/functions_modules.php: Added missing enterprise_hook()
wrapper calls.
MERGED FROM branch4.x
2013-08-16 Miguel de Dios <miguel.dedios@artica.es>
* extensions/pandora_logs.php: fixed the translation the human

3
pandora_console/godmode/agentes/agent_manager.php
View File

@ -118,7 +118,8 @@ echo '<div style="height: 5px">&nbsp;</div>';
if (!$new_agent) {
// Agent remote configuration editor
$filename = config_agents_get_agent_config_filenames($id_agente);
enterprise_include_once('include/functions_config_agents.php');
$filename = enterprise_hook('config_agents_get_agent_config_filenames', $id_agente);
}
$disk_conf = (bool) get_parameter ('disk_conf');

6
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -87,7 +87,8 @@ if ($agent_to_delete) {
// Check if the remote config file still exist
if (isset ($config["remote_config"])) {
if (config_agents_has_remote_configuration($id_agente)) {
enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration', $id_agente)) {
ui_print_error_message(__('Maybe the files conf or md5 could not be deleted'));
}
}
@ -478,7 +479,8 @@ if ($agents !== false) {
echo "<td align='center' class='$tdcolor'>";
// Has remote configuration ?
if (enterprise_installed()) {
if (config_agents_has_remote_configuration($agent["id_agente"])) {
enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration', $agent["id_agente"])) {
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>";
echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')));
echo "</a>";

3
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -337,7 +337,8 @@ switch ($moduletype) {
// Has remote configuration ?
$remote_conf = false;
if (enterprise_installed()) {
$remote_conf = config_agents_has_remote_configuration($id_agente);
enterprise_include_once('include/functions_config_agents.php');
$remote_conf = enterprise_hook('config_agents_has_remote_configuration', $id_agente);
}
/* Categories is an array containing the allowed module types

3
pandora_console/include/functions_agents.php
View File

@ -1669,7 +1669,8 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
// Delete remote configuration
if (isset ($config["remote_config"])) {
if (config_agents_has_remote_configuration($id_agent)) {
enterprise_include_once('include/functions_config_agents.php');
if (enterprise_hook('config_agents_has_remote_configuration', $id_agent)) {
$agent_name = agents_get_name($id_agent);
$agent_name = io_safe_output($agent_name);
$agent_md5 = md5 ($agent_name, false);

2
pandora_console/include/functions_modules.php
View File

@ -129,7 +129,7 @@ function modules_copy_agent_module_to_agent ($id_agent_module, $id_destiny_agent
$id_agente = modules_get_agentmodule_agent($id_agent_module);
$file = config_agents_get_agent_config_filenames($id_agente);
$file = enterprise_hook('config_agents_get_agent_config_filenames', $id_agente);
$agent_md5 = $file['md5'];
$remote_conf = $file['conf'];