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

2013-08-07 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/modificar_agente.php,
	godmode/agentes/module_manager_editor.php: changed the code to
	avoid to call enterprise functions.
	
	Fixes: #2367
	
	*include/functions_agents.php: fixed source code style..




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8640 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-08 06:23:48 +00:00
parent 93589e7fd4
commit a3dad1b227
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php,
godmode/agentes/module_manager_editor.php: changed the code to
avoid to call enterprise functions.
Fixes: #2367
*include/functions_agents.php: fixed source code style..
2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_agente.php: fixed the call to

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

@ -477,10 +477,12 @@ if ($agents !== false) {
echo "<td align='center' class='$tdcolor'>";
// Has remote configuration ?
if (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>";
if (enterprise_installed()) {
if (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>";
}
}
echo "</td>";

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

@ -335,7 +335,10 @@ switch ($moduletype) {
case MODULE_DATA:
$moduletype = MODULE_DATA;
// Has remote configuration ?
$remote_conf = config_agents_has_remote_configuration($id_agente);
$remote_conf = false;
if (enterprise_installed()) {
$remote_conf = config_agents_has_remote_configuration($id_agente);
}
/* Categories is an array containing the allowed module types
(generic_data, generic_string, etc) from ttipo_modulo (field categoria) */

2
pandora_console/include/functions_agents.php
View File

@ -179,7 +179,7 @@ function agents_get_alerts_simple ($id_agent = false, $filter = '', $options = f
$disabled = '';
else
$disabled = 'WHERE disabled = 0';
$subQuery = 'SELECT id_agente_modulo
FROM tagente_modulo ' . $disabled;
}