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

2012-06-20 Miguel de Dios <miguel.dedios@artica.es> 

* extensions/net_tools.php: cleaned source code style.
	
	* extensions/module_groups.php,
	operation/agentes/status_monitor.php: fixed the lost "module group"
	"unasigned".
	
	Fixes: #3532075
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-06-20 09:43:14 +00:00
parent 62dc186577
commit 8b1190353d
4 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/net_tools.php: cleaned source code style.
* extensions/module_groups.php,
operation/agentes/status_monitor.php: fixed the lost "module group"
"unasigned".
Fixes: #3532075
MERGED FROM 4.0.2
2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php

11
pandora_console/operation/agentes/status_monitor.php
View File

@ -48,7 +48,7 @@ $ag_modulename = (string) get_parameter ('ag_modulename');
$ag_group = (int) get_parameter ('ag_group', 0);
$offset = (int) get_parameter ('offset');
$status = (int) get_parameter ('status', 4);
$modulegroup = (int) get_parameter ('modulegroup');
$modulegroup = (int) get_parameter ('modulegroup', -1);
$sql_extra = '';
$refr = get_parameter('refr', 0);
// Sort functionality
@ -81,8 +81,10 @@ echo '</td>';
echo '<td valign="middle">'.__('Module group').'</td>';
echo '<td valign="middle">';
html_print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
'modulegroup', $modulegroup, '',__('All'), 0, false, false, true, false, 'width: 100px;');
$rows = db_get_all_rows_sql("SELECT * FROM tmodule_group ORDER BY name");
$rows = io_safe_output($rows);
$rows[0] = __('Not assigned');
html_print_select($rows, 'modulegroup', $modulegroup, '', __('All'), -1);
echo '</td></tr><tr><td valign="middle">'.__('Module name').'</td>';
echo '<td valign="middle">';
@ -92,7 +94,6 @@ $user_groups = implode (",", array_keys (users_get_groups ()));
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$profiles = db_get_all_rows_sql('SELECT id_grupo
FROM tusuario_perfil AS t1
INNER JOIN tperfil AS t2 ON t1.id_perfil = t2.id_perfil
@ -339,7 +340,7 @@ elseif($user_groups != '') {
}
// Module group
if ($modulegroup > 0) {
if ($modulegroup > -1) {
$sql .= sprintf (" AND tagente_modulo.id_module_group = '%d'", $modulegroup);
}