tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-26 23:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-02-12 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* godmode/agentes/configurar_agente.php: Changed the call of 
	an Enterprise function to use HOOK to avoid errors in
	Open version



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7630 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-12 13:42:24 +00:00
parent a782f67fc7
commit 117a9badb3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-02-12 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/configurar_agente.php: Changed the call of
an Enterprise function to use HOOK to avoid errors in
Open version
2013-02-12 Sancho Lerena <slerena@artica.es> 2013-02-12 Sancho Lerena <slerena@artica.es>
* extensions/update_manager/load_updatemanager.php * extensions/update_manager/load_updatemanager.php

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

@ -729,8 +729,6 @@ if ($update_module || $create_module) {
$macros = json_encode($macros); $macros = json_encode($macros);
$macros_for_data = config_agents_get_macros_data_conf($_POST);
$conf_array = explode("\n",$configuration_data); $conf_array = explode("\n",$configuration_data);
foreach($conf_array as $line) { foreach($conf_array as $line) {
if(preg_match("/^module_name\s*(.*)/", $line, $match)) { if(preg_match("/^module_name\s*(.*)/", $line, $match)) {
@ -742,7 +740,9 @@ if ($update_module || $create_module) {
} }
} }
if($macros_for_data != '') { $macros_for_data = enterprise_hook('config_agents_get_macros_data_conf', array($_POST));
if($macros_for_data !== ENTERPRISE_NOT_HOOK && $macros_for_data != '') {
// Add macros to configuration file // Add macros to configuration file
$new_configuration_data = str_replace('module_end', $macros_for_data."module_end", $new_configuration_data); $new_configuration_data = str_replace('module_end', $macros_for_data."module_end", $new_configuration_data);
} }