Commit Graph

5523 Commits

Author SHA1 Message Date
juanmanuelr 5e5570f5c4 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/modu_group_list.php: Fixed module update when a 
	module group is deleted.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:24:43 +00:00
zarzuelo d120f6acdf 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php
	include/functions_reporting.php: Fixed layout issues in
	SLA reports and add ttl param to slice graphs 
	function to pdf side

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6634 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:11:53 +00:00
slerena 4ea345aac6 2012-06-20 Sancho Lerena <slerena@artiac.es>
* extensions/update_manager/sql/update_manager.sql: 4.0.2 comes with a fixed
        last package installed of 412

        * extensions/update_manager/load_updatemanager.php: Fixed execution
        of keygen: now uses dbtype as last parameter in execution.

        * include/functions_config.php: Avoid to check for new update on each
        page render (BAD!)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6631 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 16:44:28 +00:00
vgilc 989d80dc0b 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php: Fixed bug: Missing text in tree view title.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6628 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:50:15 +00:00
mdtrooper 412ddf8cdb 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php,
	extensions/update_manager/lib/functions.php: uploaded lost changes.
	
	* include/functions_filemanager.php: cleaned source code style.
	
	* include/functions.php: added function "copy_dir" for use in the
	bug #3527247.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6627 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:43:41 +00:00
vgilc 38e5bfc682 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	  godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu 
	there is an option "Timestamp or time comparation" which has not a selected
	value by default.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6624 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 14:54:37 +00:00
Ramon Novoa 652523829f 2012-06-20 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update version in agent configuration
	  files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6622 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 13:42:17 +00:00
juanmanuelr 367ad38f93 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph
	function when graph data only has one element.
	
	 include/functions_reporting.php
	 operation/reporting/reporting_viewer.php: Fixed a visualization 
	 problem in agent_modules report item.
	 
	 godmode/users/profile_list.php: Fixed a bug when profile creation
	fails.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 11:45:12 +00:00
vgilc bcc468c356 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager.php
	  operation/agentes/estado_agente.php
	  operation/agentes/status_monitor: Changed interval format.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:56:40 +00:00
zarzuelo c091275af2 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	operation/agentes/estado_agente.php: Fixed sort actions
	of agents operation view

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:17:09 +00:00
mdtrooper 8b1190353d 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/net_tools.php: cleaned source code style.
	
	* extensions/module_groups.php,
	operation/agentes/status_monitor.php: fixed the lost "module group"
	"unasigned".
	
	Fixes: #3532075
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:43:14 +00:00
santimunin 62dc186577 2012-06-20 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/API.java: New class, it will provide all API calls.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Loading more events on scroll down.
	* src/pandroid_event_viewer/pandorafms/Core.java: Added HTTPS connections.
	* src/pandroid_event_viewer/pandorafms/Options.java: Added self-signed certificates check.
	* src/pandroid_event_viewer/pandorafms/NaiveTrustManager.java: HTTPS through self-signed websites.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: Added ListAdapter to get events asynctask as a parameter.
	* res/layout/list_view_layout.xml: Little UI changes.
	* res/layout/item_list_event_layout.xml: Little UI changes.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:32:49 +00:00
zarzuelo bcce0e52b3 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	godmode/agentes/module_manager.php: Added not init status
	in the manage modules view for bug 3533341

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:03:30 +00:00
mdtrooper e7349acfd0 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions.php: cleaned source
	code style.
	
	* extensions/extension_uploader.php: fixed the upload enterprise
	extension.
	
	Fixes: #3532208
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 08:28:34 +00:00
hkosaka ffc635780b 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: 'whereis' could find a
	command regardless of whether reachable or not with $PATH
	(and leads to fail the subsequent command execution).
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:54:50 +00:00
hkosaka 331820371e 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: cannot find traceroute
	other than /usr/sbin/traceroute.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:27:56 +00:00
hkosaka 0690e32063 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Changed ambiguous time representation
	"MM:SS minutes", that can read 'MM hours SS minute', to 
	"MM minutes SS seconds".
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 03:34:57 +00:00
markholland 240209747b 2012-06-19 Mark Holland <mark@mark-holland.me.uk>
* res/layout.main.xml: removed as no longer used
	 in pandroid 2.0

	* res/values/strings.xml: Added strings for simID,
	upTime, start, loading and agent stopped. Replicated
	in values-en and values-es
	
	* src/pandroid/agent/core.java: Added variables 
	for simID and upTime
 	
	* src/pandroid/agent/PandroidAgent.java: commented
	out unnecessary code from version 1.0. Removed
	absolute tab height as it interferes with high
	density screens.

	* src/pandroid/agent/PandroidAgentListener.java: 
	Android version is now set as per device rather 
	than a fixed string. simID, upTime and networkOperator 	methods
	and then added to XML

	* src/pandroid/agent/setup.java: commented
	out unnecessary code from version 1.0

	* src/pandroid/agent/SMSActivity.java: Started work

	* src/pandroid/agent/SMSBroadcastReceiver.java: 
	Started work

	* src/pandroid/agent/status.java: Created onStart
	method to better follow android standard. run()
	is executed here. Fixed way toasts for connection 
	messages are handled. Added textviews for simID 
	and upTime values. added start/stop, show and hide 
	XML buttons for debugging purposes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6601 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 22:37:03 +00:00
zarzuelo fde60847ac 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* general/header.php: Add hint to explain the use of
	blank characters in global search as AND conditions
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 15:45:25 +00:00
vgilc 375cf62362 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_audit.php: Fixed bug:don't display any 
	message to confirm the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 12:15:56 +00:00
vgilc bf82105529 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_sanity.php: Fixed bug: to sanitise
	my database now, don't display any message to confirm
	the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:19:53 +00:00
zarzuelo 174f3b0c96 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Fixed check referer bug with 
	https when is not forced. Bug #3525494
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:07:38 +00:00
zarzuelo 33d048263e 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_incidents.php: Changed a parameter
	of the xml2array function to set it equal to recent
	fix in 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:49:49 +00:00
mdtrooper fed40c748e 2012-06-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.list_items.php: some fixes.

	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:25:45 +00:00
zarzuelo e042e0154f 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added categories in the
	combo of sections (Operation and Administration)
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 16:51:32 +00:00
darode f34cf1a37a 2012-06-18 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a bug which shows groups
        that only have empty agents.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:58:41 +00:00
zarzuelo ee7084bf5a 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added missed sec2 to the menu 
	structure data. The main sec2 (not subsection). Clean code
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:39:52 +00:00
zarzuelo a9637c201f 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/ajax/menu.ajax.php: Added an ajax file to the functions
	of menu category
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:26:22 +00:00
zarzuelo bfe6fb2504 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php
	index.php
	operation/menu.php
	godmode/menu.php: Added functions to manage sec and sec2 to control
	access in ACLs. Rename variables in menu construction to can get 
	all the sata structures in other sections
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:16:17 +00:00
vgilc a6fceeb5a1 2012-06-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php: Fixed bug: Notice to change
	Admin password is displayed for other users.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6571 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 14:08:02 +00:00
mdtrooper 5e3c15d43c 2012-06-18 Miguel de Dios <miguel.dedios@artica.es>
* include/auth/ldap.php, include/javascript/pandora.js,
	include/functions_incidents.php: cleaned source code style.
	
	* include/functions_users.php, operation/users/webchat.php: a lot of
	fixes, the "error connection" don't appear when timeout the
	connection for to get new messages, fixed empty messages, and
	fixed when make freak actions with user connect in webchat for
	example delete. And the most important the chat files (logs and
	others) now Pandora save this files in attachment dir instead the
	tmp system dir.
	
	* godmode/users/user_list.php: added to call to delete from the
	chat user list when delete a user.
	
	MERGED from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6570 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 12:36:18 +00:00
juanmanuelr d75e0dc869 2012-06-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php
	 godmode/agentes/module_manager_editor_common.php: Modified width
	 of module type select in module editor when you are 
	 editing/creating a network module.
	 
	* include/functions.php
	 godmode/reporting/visual_console_builder.php: Fixed autorefresh
	 functionality.

	* include/functions_ui.php
	 godmode/massive/massive_edit_modules.php 
	 operation/agentes/ver_agente.php: Several Php warnings
	 fixed over console code.

	* godmode/reporting/reporting_builder.list_items.php: Fixed broken 
    view due to a bad sintax statement.

	Merged fro branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6568 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 11:22:13 +00:00
zarzuelo a67900b5da 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php: Cleaning the mess when 
	update setup fields. Now, looking the $sec2, only
	will be updated the fields of the current setup section
	In this way, set fields as empty value has been
	fixed
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 11:10:57 +00:00
juanmanuelr 509f6ff06e 2012-06-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* index.php: Fixed global autorefresh bug.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 10:48:07 +00:00
juanmanuelr d60ed8d98d 2012-06-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_config.php
	 operation/users/user_edit.php
	 godmode/massive/massive_add_action_alerts.php
	 godmode/reporting/reporting_builder.php
	 godmode/reporting/graphs.php: Fixed Php warning due to pass by
	 references variables and improvement in skins update.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 10:45:00 +00:00
vgilc b5600a680a 2012-06-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php: Don't display
	notice to update.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 10:05:46 +00:00
vgilc b5918f3764 2012-06-15 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events.php: Show success message
	when you delete an event.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6556 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-15 10:46:40 +00:00
mdtrooper 45641e2d38 2012-06-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions_reporting.php,
	include/functions_groups.php, include/functions_visual_map.php,
	include/ajax/reporting.ajax.php, include/functions_ui.php,
	extensions/agents_modules.php, extensions/module_groups.php,
	operation/incidents/incident.php,
	operation/incidents/incident_detail.php,
	operation/agentes/status_monitor.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/estado_agente.php,
	operation/agentes/ver_agente.php,
	operation/snmpconsole/snmp_view.php.
	operation/integria_incidents/incident.incident.php,
	mobile/operation/agents/monitor_status.php,
	mobile/operation/agents/view_agents.php,
	mobile/operation/agents/view_alerts.php,
	mobile/operation/events/events.php,
	godmode/groups/modu_group_list.php, godmode/groups/group_list.php,
	godmode/agentes/module_manager.php,
	godmode/agentes/modificar_agente.php,
	godmode/agentes/configurar_agente.php,
	godmode/alerts/alert_list.list.php, godmode/setup/os.list.php,
	godmode/users/configure_user.php,
	godmode/modules/manage_network_templates.php,
	godmode/reporting/reporting_builder.list_items.php,
	godmode/tag/tag.php: changed the calls of "ui_print_truncate_text"
	now we are trying that more easy and standar, now the string name of
	agent have the equal number of characters in all code...but there
	are two styles, small and medium size for agents text name, modules
	text name, but description is only size. You can set this sizes in
	the visual setup page into your Pandora.
	
	MERGED from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 16:23:23 +00:00
vgilc 85086ef5cd 2012-06-14 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  godmode/agentes/modificar_agente.php
	  operation/agentes/estado_agente.php: Fixed bug: sort doesn't work.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6552 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 16:10:10 +00:00
zarzuelo aaf245c9d4 2012-06-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php
	include/api.php: Change the names of the functions_api
	functions with prefix 'api_' for security. Improve
	the wildcards of the ACL's IP list to allow place 
	wilcard anywhere. Add to API the possibility 
	of be extended from extensions.
	MERGED from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 15:07:40 +00:00
zarzuelo 677f5c017b 2012-06-14 Sergio Martin <sergio.martin@artica.es>
* include/api.php: Change the security checks adding
	a new parameter to API pass
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6549 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 11:59:10 +00:00
mdtrooper 4a44893f0b 2012-06-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: deprecated the function with bad and
	crazy name "agents_get_module_id" and changed for the function with
	more clear mind name "agents_get_agent_id_by_module_id".
	
	* godmode/alerts/configure_alert_compound.php,
	godmode/reporting/reporting_builder.list_items.php: changed the
	calls of the deprecate function "agents_get_module_id".
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 11:52:27 +00:00
Ramon Novoa 4948486eff 2012-06-14 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php: Merged from 4.0 branch. Added history
	  database support to combined graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 10:11:35 +00:00
mdtrooper 5bc0b9947f 2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, include/functions_ui.php,
	include/functions.php, include/constants.php,
	mobile/operation/agents/monitor_status.php,
	godmode/setup/setup_visuals.php: started to working into the set
	a standar truncate string in all code of Pandora Console.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6543 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 18:01:43 +00:00
mdtrooper 3692c286b8 2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/ver_agente.php: cleaned source code from  merge
	some cosmetic changes in the trunk and this branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 16:59:36 +00:00
vgilc 498a319cf8 2012-06-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manage_editor_common.php: Disable button
	'disabled' when a module is linked to a policy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 15:31:41 +00:00
mdtrooper e1013140e4 2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions_reporting.php,
	include/functions_groups.php, include/functions_visual_map.php,
	include/ajax/reporting.ajax.php, include/functions_config.php,
	include/functions_ui.php, include/functions.php,
	extensions/agents_modules.php, extensions/module_groups.php,
	operation/incidents/incident.php,
	operation/incidents/incident_detail.php,
	operation/agentes/status_monitor.php,
	operation/agentes/estado_generalagente.php,
	operation/agentes/estado_agente.php,
	operation/agentes/ver_agente.php,
	operation/snmpconsole/snmp_view.php,
	operation/integria_incidents/incident.incident.php,
	operation/integria_incidents/incident.php: a lot of fixes in
	relation with entities and clean source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6537 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 15:29:00 +00:00
darode e3130cca1e 2012-06-12 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/Core.pm: Fixed an error with group_statistics agent
        queries.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 11:20:31 +00:00
juanmanuelr 93bd73fb81 2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor.php: Fixed strings of link
	and unlink actions due to bad translation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 11:17:48 +00:00
juanmanuelr 4ba0726c7d 2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed creation of alert
	with action.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6530 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-13 10:52:24 +00:00