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

2012-04-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* godmode/groups/group_list.php
	 godmode/reporting/graph_builder.graph_editor.php: Reverted some 
	 modifications in custom graphs metaconsole compatibility.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5936 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-11 09:05:45 +00:00
parent c4240d7a62
commit 12ebf5fec3
3 changed files with 12 additions and 6 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 @@
2012-04-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/group_list.php
godmode/reporting/graph_builder.graph_editor.php: Reverted some
modifications in custom graphs metaconsole compatibility.
2012-04-11 Sergio Martin <sergio.martin@artica.es> 2012-04-11 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_delete_modules.php: Fixed a * godmode/massive/massive_delete_modules.php: Fixed a

6
pandora_console/godmode/groups/group_list.php
View File

@ -86,7 +86,7 @@ if (is_ajax ()) {
$filter['string'] = $search; $filter['string'] = $search;
} }
if ($config['metaconsole'] == 1) { /*if ($config['metaconsole'] == 1) {
enterprise_include_once('include/functions_metaconsole.php'); enterprise_include_once('include/functions_metaconsole.php');
$connection_names = enterprise_hook('metaconsole_get_connection_names'); $connection_names = enterprise_hook('metaconsole_get_connection_names');
@ -114,9 +114,9 @@ if (is_ajax ()) {
enterprise_hook('metaconsole_restore_db'); enterprise_hook('metaconsole_restore_db');
} }
} }
else { else { */
$agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion); $agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion);
} //}
echo json_encode ($agents); echo json_encode ($agents);
return; return;

6
pandora_console/godmode/reporting/graph_builder.graph_editor.php
View File

@ -129,7 +129,7 @@ echo "<td></td>";
echo "<td style='vertical-align: top;'>".__('Modules')."</td>"; echo "<td style='vertical-align: top;'>".__('Modules')."</td>";
echo "</tr><tr>"; echo "</tr><tr>";
// If metaconsole is activated // If metaconsole is activated
if ($config['metaconsole'] == 1) { /*if ($config['metaconsole'] == 1) {
enterprise_include_once('include/functions_metaconsole.php'); enterprise_include_once('include/functions_metaconsole.php');
$connection_names = enterprise_hook('metaconsole_get_connection_names'); $connection_names = enterprise_hook('metaconsole_get_connection_names');
@ -160,9 +160,9 @@ if ($config['metaconsole'] == 1) {
echo "<td>".html_print_select ($agents, 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>"; echo "<td>".html_print_select ($agents, 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>";
} }
else { else {*/
echo "<td>".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>"; echo "<td>".html_print_select (agents_get_group_agents(), 'id_agents[]', 0, false, '', '', true, true, true, '', false, 'width:200px;')."</td>";
} //}
echo "<td style='vertical-align: center; text-align: center;'>" . html_print_image("images/darrowright.png", true) . "</td>"; echo "<td style='vertical-align: center; text-align: center;'>" . html_print_image("images/darrowright.png", true) . "</td>";
echo "<td>".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;')."</td>"; echo "<td>".html_print_select (array (), 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;')."</td>";
echo "</tr><tr>"; echo "</tr><tr>";