Commit Graph

5280 Commits

Author SHA1 Message Date
mdtrooper 6175675263 2012-04-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php, include/api.php: fixed when some error
	in get_events__user, and added constants flags for debug in the
	header of source file.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 18:09:05 +00:00
zarzuelo bba2910084 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed method of obtain
	runlevel to be valid on OpenSuse
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 16:47:03 +00:00
zarzuelo 4037d8e3b4 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* win32/bin/pandora_agent.conf
	unix/Linux/pandora_agent.conf: Restore files changed
	by error in last commit



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 16:03:46 +00:00
mdtrooper d715b917f0 2011-12-25 Miguel de Dios <miguel.dedios@artica.es>
Apply patch from user Santiago Munín González <burning1@gmail.com>

	* src/pandroid_event_viewer/pandorafms/Main.java: fixed the empty
	combo group because sometimes this is as null.
	
	Fixes: #3495038
	
	MERGED FROM BRANCH 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6164 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 15:59:04 +00:00
zarzuelo d48ae7a199 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed init_services inventory modules
	in machines /etc/rc.d/rcX.d paths instead of /etc/rcX.d/ paths
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 15:55:26 +00:00
mdtrooper a3236c252e 2012-04-25 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/postinst, DEBIAN/make_deb_package.sh: disabled the checking
	the plugins files with same name.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6160 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 15:31:00 +00:00
zarzuelo 5dea8745a5 2012-04-25 Sergio Martin <sergio.martin@artica.es>
* unix/plugins/inventory: Fixed several bugs in the
	inventory plugin as missed separator to end the parse,
	fill with empty string the empty columns, etc. for bug 3519796
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 15:07:33 +00:00
darode 98070fb263 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Fixed a default module type.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 14:10:15 +00:00
darode d4044f19ac 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Improved windows configuration file.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 14:03:50 +00:00
juanmanuelr be556244e2 2012-04-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/menu.php
	 operation/events/events.php: SoundEvent popup now it's resizable in
	 IE.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 12:31:38 +00:00
vgilc 9b264bed95 2012-04-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/performance.php: Changed the order of options.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 12:02:36 +00:00
darode 5cbd9bdb9a 2012-04-25 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb_data.sql,
	pandoradb.data.postgreSQL.sql,
	pandoradb.data.oracle.sql: Added default value 127.0.0.1 to IP ACL API list

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 09:41:34 +00:00
vgilc 3cf9b68554 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6143 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2012-04-25 09:14:08 +00:00
vgilc 687a354165 2012-04-25 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php: Fixed several bugs.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 09:12:42 +00:00
darode a043405ec5 2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf,
	unix/Linux/pandora_agent.conf: Added more examples of modules enabled and
	improved comments in config file for windows and linux.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6141 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 07:20:59 +00:00
vgilc 57b8904d27 2012-04-24 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php: Added units to modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 16:53:11 +00:00
mdtrooper 355933a461 2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/sound_events.php, godmode/setup/setup.php: fixed
	the audio, now it uses the html5 tag.
	
	Fixes: #3472957
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 14:46:00 +00:00
mdtrooper 8c5de64b91 2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* install.php: cleaned source code style.
	
	* include/functions_graph.php: added into the src attribute the
	$config['homeurl'] in the functions "progress_bar" and
	"progress_bubble" to show the images in other paths that usually
	path.
	
	* include/functions_ui.php: fixed into the function
	"ui_process_page_head" when try to use in others paths that usually
	path (like as homeurl) and this bug have been for js and css.
	
	* operation/visual_console/public_console.php: fixed and re-design
	the page.
	
	Fixes: #3520670
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 13:45:02 +00:00
mdtrooper 5e83f35a13 2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* include/Image/image_functions.php: fixed into the function
	"createthumb" when you have a path with "." character try to extract
	the extension of file before of name of file.
	
	* include/config_process.php: disabled warning message of PHP5 about
	the timezone.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 11:52:07 +00:00
juanmanuelr c2e58c9d49 2012-04-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 operation/agentes/stat_win.php: Added units to Y axis in static 
	graphs. Also changed layout of launcher module graph window. 
	
	Fixes: #3520728



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6129 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 11:20:27 +00:00
darode 6c3dae49dd 2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/agentes/estado_agente.php,
	operation/agentes/ver_agente.php,
	operation/menu.php,
	godmode/agentes/agent_template.php,
	godmode/agentes/fields_manager.php,
	godmode/agentes/agent_conf_gis.php,
	godmode/agentes/module_manager.php,
	godmode/agentes/modificar_agente.php,
	godmode/agentes/configurar_agente.php,
	godmode/agentes/configure_field.php,
	godmode/agentes/planned_downtime.php,
	godmode/agentes/agent_manager.php,
	godmode/menu.php: Fixed some problems with links and new menu structure.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6127 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 10:02:06 +00:00
ramonn 5da03e4bba 2012-04-24 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Merged from 4.0 branch. Leave the secondary server
	  password empty by default. Fixes bug #3519520.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6126 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 09:31:27 +00:00
darode 224c8501a4 2012-04-24 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/menu.php: Moved submenu "SNMP trap generator" to a second
        level menu inside "SNMP console" submenu.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-24 07:48:59 +00:00
mdtrooper e7459d7da3 2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed into the function
	"visual_map_print_visual_map" the unclose links of percentile bar.
	
	Fixes: #3520640
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 17:21:46 +00:00
mdtrooper e09449c110 2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* index.php: fixed php noticie message about uninicialized var.
	
	* godmode/reporting/visual_console_builder.php: fixed the image url
	in the header.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6110 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 16:38:09 +00:00
zarzuelo 1a1f9607bc 2012-04-23 Sergio Martin <sergio.martin@artica.es>
* operation/menu.php: Changed the order of the reporting 
	subsections and set reports view to default target in the 
	reporting section link



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6108 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 16:04:29 +00:00
mdtrooper 64eaaf4927 2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* index.php: fixed notice message php.
	
	* extensions/update_manager/lib/libupdate_manager.php: fixed into
	the function "um_db_load_settings" the cache of DB, and set to
	translate some untranslate text.
	
	* include/config_process.php: added for a long time the setting the
	$develop_bypass as global.
	
	* extensions/update_manager/settings.php, operation/menu.php,
	operation/search_agents.php: cleaned source code style.
	
	* include/functions_config.php: fixed php noticie message of the
	var "$config['update_manager_installed']" in the first execution
	after intallation.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6106 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 14:29:34 +00:00
zarzuelo e1cab9b8b4 2012-04-23 Sergio Martin <sergio.martin@artica.es>
* include/functions_networkmap.php
	include/ajax/networkmap.ajax.php
	operation/agentes/networkmap.topology.php: Fixed several
	errors in the apache log when generate networkmap and add
	to the root node a little map summary



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6103 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 14:21:54 +00:00
ramonn e57e0e5371 2012-04-23 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Merged from 4.0 branch. Do not insert zeroes
	  when something goes wrong while processing an inc module. Fixes bug
	  #3519591.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6102 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 14:12:35 +00:00
darode cb2aeecc08 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/visual_console_builder.data.php: Fixed a problem
	with some links and new menu structure.

	MERFED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6099 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 13:30:17 +00:00
mdtrooper 207cc9717b 2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_users.php, operation/users/webchat.php: added
	list users in chat.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6097 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 12:36:53 +00:00
ramonn e80812047c 2012-04-23 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/NetworkServer.pm,
	  lib/PandoraFMS/WMIServer.pm,
	  lib/PandoraFMS/PluginServer.pm: Simplified the calculation of
	  time_left to make sure it is always positive. Fixes bug #3519099.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6094 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 12:16:20 +00:00
darode 41d449e5fb 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/visual_console_builder.wizard.php: Unsorted
        combo in visual console wizard to switch the default type of item
        to static graph to preserve the previous default behaviour.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6093 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 12:08:20 +00:00
vgilc fd483742b2 2012-04-23 Vanessa Gil <vanessa.gil@artica.es>
* operation/menu.php
	  operation/agentes/exportdata.php: Fixed bug: Error exporting
	data to excel or csv.

	operation/agentes/exportdata.csv.php
	operation/agentes/exportdata.excel.php: Added files.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6090 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 11:52:41 +00:00
juanmanuelr 2511b63667 2012-04-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_networkmap.php
	 operation/agentes/networkmap_list.php
	 operation/menu.php: Added new view with a list of networkmaps.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6089 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 11:37:17 +00:00
mdtrooper c6a2e14e04 2012-04-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/javascript/jquery.pandora.js,
	include/functions_db.php: cleaned source code style.
	
	* include/functions_users.php, index.php, operation/menu.php,
	operation/users/webchat.php, include/javascript/webchat.js,
	general/header.php: added first version of webchat.
	
	* include/functions.php: into the function "check_login" added the
	parameter $output for some cases don't want see the error page like
	as the ajax querys.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6088 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 11:20:28 +00:00
darode 9294f23fd0 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/search_reports.php,
	godmode/reporting/reporting_builder.list_items.php,
	godmode/reporting/reporting_builder.item_editor.php: Fixed some issues
	with reportin usability related to new menu structure.

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6086 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 11:07:26 +00:00
ramonn a09ee7b29a 2012-04-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Merged from 4.0 branch. Do not try to reset
	  the internal counter unless it is > 0. Fixed a warning.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6083 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 09:44:48 +00:00
darode c60a24b415 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/pandora_agent.conf: Added "parent_agent_name" parameter
        which was missing for windows configuration file.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6082 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 08:49:04 +00:00
darode 74facd9b6c 2012-04-23 Dario Rodriguez <dario.rodriguez@artica.es>
*extensions/snmp_explorer.php,
	operation/agentes/estado_monitores.php,
	operation/agentes/ver_agente.php,
	operation/snmpconsole/snmp_view.php,
	operation/gis_maps/render_view.php,
	godmode/agentes/fields_manager.php,
	godmode/agentes/configure_field.php,
	godmode/agentes/planned_downtime.php: Fixed a problem with agent sec
	param changed from gagente to estado in order to display new menus properly

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6080 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-23 07:56:23 +00:00
jsatoh e005640eb8 2012-04-21 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php: Fixed SQL error with PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6077 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-21 14:50:33 +00:00
jsatoh a274351ad4 2012-04-21 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_network_map.php: Updated description to
	follow usability improvement of network map.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6075 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-21 09:25:19 +00:00
jsatoh 1f1b2c8003 2012-04-21 Junichi Satoh <junichi@rworks.jp>
* index.php: Fixed bug home screen is not shown when default language
	is set to non-English.

	* operation/users/user_edit.php: Fixed 'Default' in home screen menu
	is not translated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6074 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-21 09:06:22 +00:00
ramonn a65bd47469 2012-04-20 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_installer: Removed an unused variable.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6073 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 13:32:10 +00:00
ramonn 724a989d7f 2012-04-20 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_installer: Backup and restore conf file and daemon
	  launcher. Moved the code that sets PANDORA_USER back to its original
	  place and set the variable properly instead.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6071 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 13:29:22 +00:00
zarzuelo 1e25daff32 2012-04-20 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Setted last_reference to current utimestamp
	in the alert table when create it



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6068 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 12:10:10 +00:00
zarzuelo e0ae525140 2012-04-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Setted last_reference database
	field to actual utimestamp when create an alert to avoid
	unecessary charge on server 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6067 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 11:38:04 +00:00
zarzuelo eff00638ed 2012-04-20 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_network_map.php
	include/help/es/help_network_map.php
	operation/agentes/networkmap.php: Fixed bug changing the
	map name and improved the usability of the settings form



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6063 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 11:09:43 +00:00
darode a8cf14bea6 2012-04-20 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_agents/win32/bin/pandora_agent.conf: Added more inventory
	parameters to inventory module

	MERGED FROM 4.0.2	



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 10:37:09 +00:00
vgilc 882afcd5b8 2012-04-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/menu.php: Changed default path to 'Module Manage'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6059 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-20 10:13:14 +00:00