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> 

* operation/agentes/estado_agente.php: fixed the call to
	enterprise function.
	
	Fixes: #2367 
	
	* godmode/agentes/module_manager.php: make more easy the merges
	from the last branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-07 10:59:09 +00:00
parent 1afefbf265
commit 3f2d13b5df
3 changed files with 17 additions and 4 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>
* operation/agentes/estado_agente.php: fixed the call to
enterprise function.
Fixes: #2367
* godmode/agentes/module_manager.php: make more easy the merges
from the last branch.
2013-08-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/setup_auth.php, godmode/admin_access_logs.php,

1
pandora_console/godmode/agentes/module_manager.php
View File

@ -399,6 +399,7 @@ switch ($sortField) {
break;
}
// Build the order sql
if (!empty($order)) {
$order_sql = ' ORDER BY ';

10
pandora_console/operation/agentes/estado_agente.php
View File

@ -491,13 +491,15 @@ foreach ($agents as $agent) {
// Has remote configuration ?
$data[9]="";
if (config_agents_has_remote_configuration($agent["id_agente"])) {
$data[9] = "<a href='index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>".
html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')))."</a>";
if (enterprise_installed()) {
if (config_agents_has_remote_configuration($agent["id_agente"])) {
$data[9] = "<a href='index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>".
html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')))."</a>";
}
}
}
array_push ($table->data, $data);
}