Commit Graph

5444 Commits

Author SHA1 Message Date
juanmanuelr 8d2c8167c5 2012-04-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css
	 include/javascript/jquery.pandora.js
	 index.php
	 general/login_help_dialog.php: Added input for license in blocking
	 license modal windows.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 20:46:38 +00:00
mdtrooper c440b53603 2012-04-26 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/exportdata.php,
	operation/events/events_list.php: cleaned source code style.
	
	* include/functions_events.php,
	include/functions_network_components.php,
	include/functions_api.php: fixed some things, the function
	"events_validate_event" when can't update as validate any event
	return false, into the file "functions_network_components" added
	$config['homedir'] for situations where include in a other path that
	index. And show error when make a bad validate event.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6197 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 14:42:48 +00:00
juanmanuelr da5f54ffd8 2012-04-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_forms.css
	 include/functions_themes.php: Removed bad Css files from visual 
	 styles.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6195 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 13:57:30 +00:00
zarzuelo 466726a59e 2012-04-26 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Added call to delete the agent
	related nodes of the network map enterprise



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6193 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 13:31:53 +00:00
vgilc 8f581a21b8 2012-04-26 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list.php: The column to validate events 
	is shown for an Operator (only read) user.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6190 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 12:14:16 +00:00
darode 9b18e175ef 2012-04-26 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/plugins/inventory: Fixed inventory plugin



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6189 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 12:02:47 +00:00
darode 461824ef86 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@6188 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 12:01:40 +00:00
vgilc 6e285177d9 2012-04-26 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_filemanager.php: Changed all messages.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6185 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 11:34:34 +00:00
mdtrooper b2dbe16678 2012-04-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php, operation/agentes/exportdata.php:
	cleaned source code style.
	
	* include/functions_api.php: fixed prevent the empty string in the
	status into the search events.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6182 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 10:03:53 +00:00
vgilc 933282e041 2012-04-26 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/reporting_builder.list_items.php: Added sort column.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6178 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 08:17:37 +00:00
jsatoh e80ef2a22c 2012-04-26 Junichi Satoh <junichi@rworks.jp>
* general/pandora_help.php: Added meta tag to avoid mistake of
	character code recognition with multibyte characters and Google
	chrome browser.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6176 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 01:32:13 +00:00
juanmanuelr 3dec3881ac 2012-04-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Removed PHP notices due to a 
	deprecated argument pass by reference.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6175 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 20:05:14 +00:00
slerena 16f3379b81 2012-04-25 Sancho Lerena <slerena@artica.es>
* general/error_emptyconfig.php,
	general/error_authconfig.php,
	general/error_dbconfig.php: minimal changes on text to fit the error
	window message.

	* godmode/modules/manage_network_templates_form.php: Fixed description.
	
	* godmode/modules/manage_network_components.php: minimal layout changes.

	* pandoradb_data.sql: New "default" values for network components, tags,
	network (group) templates, ant agent custom fields.

	* operation/agentes/estado_monitores.php: More size for the description 
	in the agent main view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6173 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 19:54:40 +00:00
juanmanuelr f16b3e48e5 2012-04-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/dialog.css
	 index.php: Added support for new login help modal window.

	* general/login_help_dialog.php: New login help modal window.
	 
	* include/functions_ui.php
	 general/logoff.php: Added required javascript files.
      
	* extensions/update_manager.php: Changed license modal 
	window style to Chrome box model.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6172 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 19:20:23 +00:00
mdtrooper 2f6aa54e9c 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 05fd6988a6 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 acfa343a1c 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 cf006dbcc1 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 d0f2e121ec 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 edd1ee264c 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 4666928be1 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 d633dc7737 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 55699ec605 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 b8488d8eec 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 6edffd4423 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 c4da86f20b 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 f29e822c61 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 40d7713557 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 6d4486ae19 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 8fc00b9790 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 7eefc80401 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 a380cb1f90 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 0b01ae6fc6 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 c5226a3b4b 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 f7d32e2da4 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
Ramon Novoa 7c320f0ce9 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 ccbdf060b2 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 463c5f6fcc 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 ae90fd5016 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 4a5cb6fca5 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 5b392d839d 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 ac69a23786 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
Ramon Novoa 27dec04695 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 94e7b4c811 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 31843ad2a0 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
Ramon Novoa b3c1a4a3b9 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 125f6e10fd 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 93f10a5498 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 f1f5c6ccdb 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 db8628453a 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