tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8786-Borrado-de-IPs-en-agente-Delete-selected-items' into 'develop'

Browse Source 
Ent 8786 borrado de i ps en agente delete selected items

See merge request artica/pandorafms!4797
This commit is contained in:
Daniel Rodriguez 2022-04-07 13:31:15 +00:00
commit bfcb4dad5e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -1065,9 +1065,9 @@ if ($update_agent) {
if ($action_delete_ip) { if ($action_delete_ip) {
$delete_ip = get_parameter_post('address_list'); $delete_ip = get_parameter_post('address_list');
if (empty($direccion_agente) === true) { if (empty($direccion_agente) === true) {
$direccideon_agente = agents_delete_address($id_agente, $delete_ip); $direccion_agente = agents_delete_address($id_agente, $delete_ip, true);
} else { } else {
agents_delete_address($id_agente, $delete_ip); $direccion_agente = agents_delete_address($id_agente, $delete_ip, true);
} }
} }
@ -1089,7 +1089,6 @@ if ($update_agent) {
'icon_path' => $icon_path, 'icon_path' => $icon_path,
'update_gis_data' => $update_gis_data, 'update_gis_data' => $update_gis_data,
'url_address' => $url_description, 'url_address' => $url_description,
'url_address' => $url_description,
'quiet' => $quiet, 'quiet' => $quiet,
'cps' => $cps, 'cps' => $cps,
'safe_mode_module' => $safe_mode_module, 'safe_mode_module' => $safe_mode_module,

11
pandora_console/include/functions_agents.php
View File

@ -2118,7 +2118,7 @@ function agents_add_address($id_agent, $ip_address)
* @param int Agent id * @param int Agent id
* @param string IP address to unassign * @param string IP address to unassign
*/ */
function agents_delete_address($id_agent, $ip_address) function agents_delete_address($id_agent, $ip_address, $return=false)
{ {
global $config; global $config;
@ -2151,13 +2151,20 @@ function agents_delete_address($id_agent, $ip_address)
$new_ip = reset($new_ips); $new_ip = reset($new_ips);
} }
// Change main address in agent to first one in the list // Change main address in agent to first one in the list.
db_process_sql_update( db_process_sql_update(
'tagente', 'tagente',
['direccion' => $new_ip], ['direccion' => $new_ip],
['id_agente' => $id_agent] ['id_agente' => $id_agent]
); );
} else {
$new_ip = agents_get_address($id_agent);
if (empty($new_ip)) {
$new_ip = '';
}
}
if ($return === true) {
return $new_ip; return $new_ip;
} }
} }