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

2011-07-21 Sergio Martin <sergio.martin@artica.es> 

* include/functions_groups.php
	godmode/modules/manage_network_templates.php
	godmode/modules/manage_network_templates_form.php: Fixed few
	issues foreach errors
	
	* godmode/agentes/agent_manager.php
	godmode/massive/massive_edit_agents.php: Fixed icon agent colors
	bug



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4606 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-21 08:23:54 +00:00
parent 3f3577b787
commit dc412fa049
6 changed files with 28 additions and 7 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 @@
2011-07-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php
godmode/modules/manage_network_templates.php
godmode/modules/manage_network_templates_form.php: Fixed few
issues foreach errors
* godmode/agentes/agent_manager.php
godmode/massive/massive_edit_agents.php: Fixed icon agent colors
bug
2011-07-20 Sergio Martin <sergio.martin@artica.es> 2011-07-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Fixed side menu confitions * include/functions_menu.php: Fixed side menu confitions

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

@ -245,9 +245,9 @@ else {
$display_icons = ''; $display_icons = '';
$path_without = $path . $icon_path . ".default.png"; $path_without = $path . $icon_path . ".default.png";
$path_default = $path . $icon_path . ".default.png"; $path_default = $path . $icon_path . ".default.png";
$path_ok = $path . $icon_path . ".default.png"; $path_ok = $path . $icon_path . ".ok.png";
$path_bad = $path . $icon_path . ".default.png"; $path_bad = $path . $icon_path . ".bad.png";
$path_warning = $path . $icon_path . ".default.png"; $path_warning = $path . $icon_path . ".warning.png";
} }
$table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) . $table->data[4][1] = html_print_select($arraySelectIcon, "icon_path", $icon_path, "changeIcons();", __('None'), '', true) .

6
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -334,9 +334,9 @@ else {
$display_icons = ''; $display_icons = '';
$path_without = $path . $icon_path . ".default.png"; $path_without = $path . $icon_path . ".default.png";
$path_default = $path . $icon_path . ".default.png"; $path_default = $path . $icon_path . ".default.png";
$path_ok = $path . $icon_path . ".default.png"; $path_ok = $path . $icon_path . ".ok.png";
$path_bad = $path . $icon_path . ".default.png"; $path_bad = $path . $icon_path . ".bad.png";
$path_warning = $path . $icon_path . ".default.png"; $path_warning = $path . $icon_path . ".warning.png";
} }
$table->data[4][0] = __('Agent icon'); $table->data[4][0] = __('Agent icon');

3
pandora_console/godmode/modules/manage_network_templates.php
View File

@ -134,6 +134,9 @@ if ($export_profile) {
} }
$result = db_get_all_rows_in_table ("tnetwork_profile", "name"); $result = db_get_all_rows_in_table ("tnetwork_profile", "name");
if($result === false) {
$result = array();
}
$table->cellpadding = 4; $table->cellpadding = 4;
$table->cellspacing = 4; $table->cellspacing = 4;

3
pandora_console/godmode/modules/manage_network_templates_form.php
View File

@ -210,6 +210,9 @@ if ($id_np > 0) {
echo '<form name="filter_group" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'#filter">'; echo '<form name="filter_group" method="post" action="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np='.$id_np.'#filter">';
echo '<div style="width:540px"><a name="filter"></a>'; echo '<div style="width:540px"><a name="filter"></a>';
$result = db_get_all_rows_in_table ("tnetwork_component_group","name"); $result = db_get_all_rows_in_table ("tnetwork_component_group","name");
if($result === false) {
$result = array();
}
//2 arrays. 1 with the groups, 1 with the groups by parent //2 arrays. 1 with the groups, 1 with the groups by parent
$groups = array (); $groups = array ();

6
pandora_console/include/functions_groups.php
View File

@ -401,6 +401,10 @@ function groups_get_all($groupWithAgents = false) {
$rows = db_get_all_rows_sql ($sql); $rows = db_get_all_rows_sql ($sql);
if($rows === false) {
$rows = array();
}
$return = array(); $return = array();
foreach ($rows as $row) { foreach ($rows as $row) {
if (check_acl ($config['id_user'], $row["id_grupo"], "AR")) if (check_acl ($config['id_user'], $row["id_grupo"], "AR"))
@ -595,4 +599,4 @@ function groups_get_users ($id_group, $filter = false) {
return $retval; return $retval;
} }
?> ?>