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

2013-06-13 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/agent_manager.php: fixed the show server as none
	when this server is not exist.
	
	Fixes: #2264
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-13 11:41:56 +00:00
parent c59decdbc9
commit 6a33bac77e
2 changed files with 13 additions and 0 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 @@
2013-06-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: fixed the show server as none
when this server is not exist.
Fixes: #2264
MERGED FROM THE BRANCH PANDORA_4.0
2013-06-12 Miguel de Dios <miguel.dedios@artica.es> 2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* extensions/insert_data.php: fixed the label of notice about the * extensions/insert_data.php: fixed the label of notice about the

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

@ -215,6 +215,10 @@ $table->data[5][1] .= ui_print_os_icon ($id_os, false, true);
$table->data[5][1] .= '</span>'; $table->data[5][1] .= '</span>';
// Network server // Network server
$servers = servers_get_names();
if (!array_key_exists($server_name, $servers)) {
$server_Name = 0; //Set the agent have not server.
}
$table->data[6][0] = __('Server'); $table->data[6][0] = __('Server');
if ($new_agent) { if ($new_agent) {
//Set first server by default. //Set first server by default.