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

2010-04-27 Sergio Martin <sergio.martin@artica.es> 

* include/functions_db.php
          operation/gis_maps/ajax.php
          godmode/agentes/planned_downtime.php
          godmode/agentes/manage_config_remote.php: Fixed many all group
          control from 1 to 0 value. Remove deprecated functions
          list_group() and list_group2() from functions_db.php




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-04-27 15:42:49 +00:00
parent 1bbb194939
commit ce9fe70b91
5 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2010-04-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php
operation/gis_maps/ajax.php
godmode/agentes/planned_downtime.php
godmode/agentes/manage_config_remote.php: Fixed many all group
control from 1 to 0 value. Remove deprecated functions
list_group() and list_group2() from functions_db.php
2010-04-27 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: added render html for "text" and "sql"

4
pandora_console/godmode/agentes/manage_config_remote.php
View File

@ -115,7 +115,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
echo '<br><br>';
// Show combo with SOURCE agents
if ($id_group > 1)
if ($id_group > 0)
$sql1 = "SELECT * FROM tagente WHERE id_grupo = $id_group ORDER BY nombre ";
else
$sql1 = "SELECT * FROM tagente WHERE id_grupo IN ($grouplist) ORDER BY nombre";
@ -136,7 +136,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
echo '<tr><td class="datost">';
echo '<b>'.__('To agent(s):').'</b><br><br>';
echo "<select name=destino[] size=10 multiple=yes style='width: 250px;'>";
if ($id_group > 1)
if ($id_group > 0)
$sql1 = "SELECT * FROM tagente WHERE id_grupo = $id_group ORDER BY nombre ";
else
$sql1 = "SELECT * FROM tagente WHERE id_grupo IN ($grouplist) ORDER BY nombre";

2
pandora_console/godmode/agentes/planned_downtime.php
View File

@ -136,7 +136,7 @@ if ($create_downtime || $update_downtime) {
$date_from = strftime ('%Y-%m-%d', $result["date_from"]);
$date_to = strftime ('%Y-%m-%d', $result["date_to"]);
if ($id_group == 1)
if ($id_group == 0)
$id_group = $result['id_group'];
}

59
pandora_console/include/functions_db.php
View File

@ -89,7 +89,7 @@ function check_acl ($id_user, $id_group, $access) {
//GroupID = 0, group id doesnt matter (use with caution!)
} else {
$query = sprintf("SELECT tperfil.incident_view,tperfil.incident_edit,tperfil.incident_management,tperfil.agent_view,tperfil.agent_edit,tperfil.alert_edit,tperfil.alert_management,tperfil.pandora_management,tperfil.db_management,tperfil.user_management FROM tusuario_perfil,tperfil WHERE tusuario_perfil.id_perfil = tperfil.id_perfil
AND tusuario_perfil.id_usuario = '%s' AND (tusuario_perfil.id_grupo = %d OR tusuario_perfil.id_grupo = 1)", $id_user, $id_group);
AND tusuario_perfil.id_usuario = '%s' AND (tusuario_perfil.id_grupo = %d OR tusuario_perfil.id_grupo = 0)", $id_user, $id_group);
}
$rowdup = get_db_all_rows_sql ($query);
@ -285,7 +285,7 @@ function get_profiles () {
*
* @return bool True if succesful, false if not
*/
function create_user_profile ($id_user, $id_profile = 1, $id_group = 1, $assignUser = false) {
function create_user_profile ($id_user, $id_profile = 1, $id_group = 0, $assignUser = false) {
global $config;
if (empty ($id_profile) || $id_group < 0)
@ -807,8 +807,8 @@ function get_monitor_last_down_timestamp_in_period ($id_agent_module, $period, $
* @return array An array with all the monitors defined in the group (tagente_modulo).
*/
function get_monitors_in_group ($id_group) {
if ($id_group <= 1) {
//We select all groups the user has access to if it's 0, -1 or 1
if ($id_group <= 0) {
//We select all groups the user has access to if it's 0 or -1
global $config;
$id_group = array_keys (get_user_groups ($config['id_user']));
}
@ -1260,57 +1260,6 @@ function get_all_groups($groupWithAgents = false) {
return $return;
}
/**
* Prints a list of <options> HTML tags with the groups the user has
* reading privileges.
*
* @deprecated Use get_user_groups () in combination with print_select ()
* instead
*
* @param string User id
* @param bool Flag to show all the groups or not. True by default.
*
* @return array An array with all the groups
*/
function list_group ($id_user, $show_all = 1){
$mis_grupos = array (); // Define array mis_grupos to put here all groups with Agent Read permission
$sql = 'SELECT id_grupo, nombre FROM tgrupo ORDER BY nombre';
$result = get_db_all_rows_sql ($sql);
if (!$result)
return $mis_grupos;
foreach ($result as $row) {
if (($row["id_grupo"] != 1 || $show_all == 1) && $row["id_grupo"] != 0 && give_acl($id_user,$row["id_grupo"], "AR") == 1) {
//Put in an array all the groups the user belongs to
array_push ($mis_grupos, $row["id_grupo"]);
echo '<option value="'.$row["id_grupo"].'">'.$row["nombre"].'</option>';
}
}
return ($mis_grupos);
}
/**
* Get a list of the groups a user has reading privileges to.
*
* @deprecated Use get_user_groups () instead
*
* @param int User id
*
* @return array A list of the groupid => groups the user has reading privileges.
*/
function list_group2 ($id_user) {
$mis_grupos = array (); // Define array mis_grupos to put here all groups with Agent Read permission
$result = get_db_all_fields_in_table ('tgrupo', 'id_grupo');
if (!$result)
return $mis_grupos;
foreach ($result as $row) {
if (give_acl ($id_user, $row["id_grupo"], "AR") == 1) {
array_push ($mis_grupos, $row["id_grupo"]); //Put in array all the groups the user belongs to
}
}
return ($mis_grupos);
}
/**
* Get a list of all users in an array [username] => (info)
*

4
pandora_console/operation/gis_maps/ajax.php
View File

@ -44,7 +44,7 @@ switch ($opt) {
$returnJSON['correct'] = 1;
if ($agentView == 0) {
$flagGroupAll = get_db_all_rows_sql('SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ' AND tgrupo_id_grupo = 1;'); //group 1 = all groups
$flagGroupAll = get_db_all_rows_sql('SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ' AND tgrupo_id_grupo = 0;'); //group 0 = all groups
$defaultCoords = get_db_row_sql('SELECT default_longitude, default_latitude
FROM tgis_map
@ -177,4 +177,4 @@ switch ($opt) {
echo json_encode($returnJSON);
break;
}
?>
?>