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

2013-08-30 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/agent_manager.php: set the first default server
	when create a new agent.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-30 11:29:57 +00:00
parent 3b12a6b059
commit 5aa0d0c1ec
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,12 +1,19 @@
2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: set the first default server
when create a new agent.
MERGED FROM THE BRANCH 4.0
2013-08-30 Miguel de Dios <miguel.dedios@artica.es> 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_generalagente.php: show a warning * operation/agentes/estado_generalagente.php: show a warning
message when the agent has not a assigned server. message when the agent has not a assigned server.
* operation/agentes/ver_agente.php: some changes for to make more * operation/agentes/ver_agente.php: some changes for to make more
easy the merge with the trunk. easy the merge with the last branch.
MERGED FROM THE TRUNK. MERGED FROM THE BRANCH 4.0
2013-08-30 Miguel de Dios <miguel.dedios@artica.es> 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>

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

@ -112,6 +112,10 @@ if (! isset ($id_agente) && ! $new_agent) {
if ($new_agent) { if ($new_agent) {
if (! empty ($direccion_agente) && empty ($nombre_agente)) if (! empty ($direccion_agente) && empty ($nombre_agente))
$nombre_agente = $direccion_agente; $nombre_agente = $direccion_agente;
$servers = servers_get_names();
if (!empty($servers))
$server_name = reset(array_keys($servers));
} }
echo '<div style="height: 5px">&nbsp;</div>'; echo '<div style="height: 5px">&nbsp;</div>';