Commit Graph

5849 Commits

Author SHA1 Message Date
mdtrooper 2cbd2b69bf 2012-07-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_netflow.php,
	extensions/snmp_explorer.php, operation/netflow/nf_live_view.php,
	operation/agentes/estado_monitores.php,
	operation/agentes/networkmap.php,
	godmode/netflow/nf_report_form.php,
	godmode/netflow/nf_edit_form.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6760 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-10 11:03:00 +00:00
mdtrooper f2c0c0762f 2012-07-10 Miguel de Dios <miguel.dedios@artica.es>
* install.php, operation/reporting/reporting_xml.php,
	operation/netflow/nf_live_view.php, operation/netflow/nf_view.php,
	operation/tree.php, operation/agentes/gis_view.php,
	operation/agentes/estado_monitores.php,
	operation/agentes/networkmap.php,
	operation/agentes/datos_agente.php,
	operation/agentes/alerts_status.php, operation/menu.php,
	operation/snmpconsole/snmp_view.php, operation/users/user_edit.php,
	godmode/groups/configure_group.php,
	godmode/groups/configure_modu_group.php,
	godmode/agentes/module_manager_editor_prediction.php,
	godmode/servers/manage_recontask.php,
	godmode/alerts/alert_compounds.php,
	godmode/alerts/configure_alert_template.php,
	godmode/alerts/alert_special_days.php, godmode/setup/links.php,
	godmode/setup/os.php, godmode/users/configure_profile.php,
	godmode/events/events.php,
	godmode/massive/massive_delete_modules.php,
	godmode/massive/massive_edit_modules.php,
	godmode/massive/massive_standby_alerts.php,
	godmode/massive/massive_add_action_alerts.php,
	godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_operations.php,
	godmode/massive/massive_delete_profiles.php,
	godmode/modules/manage_network_components.php,
	godmode/modules/manage_nc_groups.php,
	godmode/reporting/graph_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	include/functions_menu.php, include/functions_visual_map.php,
	include/functions_db.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6759 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-10 10:38:02 +00:00
mdtrooper ae4a12872c 2012-07-10 Miguel de Dios <miguel.dedios@artica.es>
* extensions/agents_alerts.php, extensions/net_tools.php,
	extensions/ssh_gateway.php,
	extensions/update_manager/lib/libupdate_manager_components.php,
	extensions/update_manager/lib/libupdate_manager_updates.php,
	general/main_menu.php: cleaned source code style and added into some
	strings the call to translation.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6758 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-10 09:21:19 +00:00
zarzuelo f5ac7cc261 2012-07-09 Sergio Martin <sergio.martin@artica.es>
* operation/extensions.php
	operation/menu.php
	godmode/extensions.php
	godmode/menu.php: Show the hidded menus and 
	extensions when metaconsole is enabled



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6757 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 15:51:32 +00:00
mdtrooper 90df82e3fb 2012-07-09 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/About.java,
	src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java,
	src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java,
	src/pandroid_event_viewer/pandorafms/Main.java: erased the
	preprocesor "@Override" for to avoid error messages in a compiler
	with default configs.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6756 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 10:59:03 +00:00
markholland 1b9b0c4b21 2012-07-09 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Added Pandora FMS 
	comment to header.

	* res/layout/About.xml: Swapped hardcoded
	text for strings.

	* res/layout/help.xml: Added scrollview.

	* res/layout/password_choose.xml: View for dialog
	when choosing whether to have a password.

	* res/layout/password_create.xml: Added textviews
	with instructions.

	* res/layout/password_entry.xml: Swapped hardcoded
	text for strings.

	* res/layout/setup.xml: Added checkboxes for all
	modules.

	* res/layout/setupnosim.xml: View that only
	shows checkboxes for modules that don't need a sim
	card present.

	* res/values/strings.xml: Updated help string
	(english only). Lots of new strings, also
	added to strings-en and strings-es.

	* src/pandroid/agent/About.java: Added Pandora FMS 
	comment to header.

	* src/pandroid/agent/core.java: Added Pandora FMS 
	comment to header. Added variable for hello signal.
	Added reporting variables for all modules. Changed 
	alarm to be accessed in a static way. changed agent
	identifier from pandroid plus simID to pandroid plus
	install uid.

	* src/pandroid/agent/Help.java:	Added Pandora FMS 
	comment to header.

	* src/pandroid/agent/Installation.java: Calculates a
	unique installation uid.

	* src/pandroid/agent/PandroidAgent.java: hasSim now 
	works whether phone without sim and also tablet without
	capability for sim card. On resume sets hello signal to 1.

	* src/pandroid/agent/PandroidAgentListener.java: Removed
	unnecessary variables, all defaults come from Core.java.
	Ensure Hello signal changed to 0 after every connection.
	Variables for all module reporting, data only added to xml
	if enabled in setup.

	* src/pandroid/agent/setup.java: Added Pandora FMS 
	comment to header. Different views loaded depending
	on whether sim card is present. Added button for changing
	password. Added checkboxes for all modules. Added dialog
	for choosing whether to set a password. Added minimum
	password length and empty to remove password. Keyboard 
	dismissed upon completing dialogs.

	* src/pandroid/agent/SMSBroadcastReceiver.java: Added 
	Pandora FMS comment to header.

	* src/pandroid/agent/status.java: Added Pandora FMS 
	comment to header. Remove incorrect toast message
	when pressing start button.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 08:35:48 +00:00
vgilc c099ad6241 2012-07-09 Vanessa Gil <vanessa.gil@artica.es>
* clock2.png: Add image.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6754 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 08:17:53 +00:00
juanmanuelr 0b9aeeecbb 2012-07-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* ajax.php: If we are executing metaconsole define metaconsole 
	constant.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-09 08:07:05 +00:00
jsatoh 83e1f18f68 2012-07-08 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	pandoradb.postgreSQL.sql: Fixed SQL error with version 8.x of
	PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6752 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-08 14:34:50 +00:00
jsatoh e612d302f9 2012-07-08 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added missing ';'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6751 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-08 13:38:38 +00:00
jsatoh 6d070c857a 2012-07-08 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added missing ';'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6750 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-08 13:33:45 +00:00
zarzuelo c33e2c92b6 2012-07-06 Sergio Martin <sergio.martin@artica.es>
* godmode/modules/manage_network_components_form.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components.php: Added wizard level
	and flag for "only metaconsole" in network components editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6749 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 12:04:17 +00:00
zarzuelo 93f10d6121 2012-07-06 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Changed flag
	only_wizard by only_enterprise



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6748 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 11:57:35 +00:00
mdtrooper 104bc62283 2012-07-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.elements.php,
	include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	include/functions_visual_map_editor.php: uploaded some fixes and
	changes for the visualmap, for example refactored some part of
	print the visualmap in operation.
	
	* include/functions_html.php: fixed when included from standarlone
	file from enterprise structure directory.
	
	* include/constants.php: added constants for avoid magic numbers
	into the code of Visualmaps.
	
	* include/graphs/functions_gd.php, include/functions.php,
	include/functions_io.php, include/functions_modules.php,
	include/functions_ui.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6747 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 11:45:02 +00:00
zarzuelo 9a71dc64c0 2012-07-06 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	godmode/users/configure_user.php: Changed some last fields
	of the wizard level, metaconsole access etc. And interface
	strings for metaconsole access in user edition



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 10:58:00 +00:00
zarzuelo eb7fa0b7ee 2012-07-06 Sergio Martin <sergio.martin@artica.es>
* godmode/users/configure_user.php: Added wizard access 
	option to users editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 09:11:10 +00:00
santimunin 41bd6a881c 2012-07-06 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Service will only start if options were configured.
	* src/pandroid_event_viewer/pandorafms/API.java: Removed a //TODO comment.
	* src/pandroid_event_viewer/pandorafms/Options.java: A "configured" value is saved in preferences as true if options were configured.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Removed group images.
	* res/layout/options.xml: Little UI changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-06 08:02:31 +00:00
santimunin c5ea8e4da3 2012-07-05 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/OnBootLoader.java: New BroadcastReceiver which starts the search new events service after the phone boot.
	* src/pandroid_event_viewer/pandorafms/Core.java: Little changes.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: On process_notification it doesn't retrieve count_events anymore.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Now the launched notification has the correct number of new events.
	* res/values/strings.xml: Added new entries.
	* res/values-en/*: Deleted, unnecessary files.
	* AndroidManifest.xml: Added the new BroadcastReceiver


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 17:10:19 +00:00
zarzuelo 7adba3caed 2012-07-05 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql: Assign to the 
	default user (admin) the full access to 
	wizard (new metaconsole)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6742 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 16:50:48 +00:00
zarzuelo 8b21ebcbb8 2012-07-05 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_v3.1_to_v3.2.sql
	extras/pandoradb_migrate_v3.2_to_v4.0.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added fields to
	wizard access to modules, network components and users tables.
	Remove all scripts



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 16:45:40 +00:00
zarzuelo 878aadd550 2012-07-05 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Fix
	wrong sec in a link from operation to godmode

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6738 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 09:54:15 +00:00
juanmanuelr f30b0dac38 2012-07-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php: Changed path to image in 
	html_print_image function if metaconsole is being using.
	
	* include/javascript/jquery.pandora.js: Added checks for jquery
	 dialog messages that avoid js warnings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 09:31:12 +00:00
zarzuelo d48d55cb04 2012-07-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php
	include/javascript/pandora_modules.js
	include/javascript/pandora.js
	godmode/agentes/module_manager_editor_common.php
	godmode/modules/manage_network_components_form_common.php: 
	Fixed several bugs of the network/local components javascript
	code and added new fields to local components
	Add new code on advanced select for time to update it from
	javascript and a workaround to do it from code loaded through 
	ajax



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6736 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-05 09:16:57 +00:00
zarzuelo 6fc5ad1b25 2012-07-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php
	operation/agentes/estado_monitores.php
	operation/snmpconsole/snmp_view.php
	operation/users/user_edit.php
	images/skin/skin_default/include/styles/pandora.css
	general/header.php: Fixes of missed "sec" changes in the new
	menus and a little hack of the classify of retrieved menus



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6734 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-04 10:47:04 +00:00
markholland 5a4b64bc1b 2012-07-04 Mark Holland <mark@mark-holland.me.uk>
* AndroidManifest.xml: Added permissions read_contacts
	and read_sms

	* res/layout/password_create.xml: Created view for
	password creation dialogue

	* res/layout/password_entry.xml: Created view for
	password entry dialogue

	* res/layout/status.xml: Converted most of data 
	into a table layout

	* res/layout/statusnosim.xml: Created status view
	only showing the data avaliable when device has
	no sim card

	* res/values/strings.xml: Added strings for bytes
	sent/received and password dialogues

	* src/pandroid/agent/core.java: added variables for
	bytes sent/received, hasSim and password. Changed 
	signal strength to integer.

	* src/pandroid/agent/PAndroidAgent.java: Added check
	if sim card present. Method for switching tabs from
	activities.

	* src/pandroid/agent/PandroidAgentListener.java: Added
	variables for bytes sent/received. Now if no sim card
	present SimID, NetworkOperator, SMSSent, NetworkType,
        PhoneType, SignalStrength, Calls, DataBytes modules aren't 		used or sent.

	* src/pandroid/agent/setup.java: Added methods for
	creating password and entering password when switching
	to setup tab(not completed). Added checkbox for simId
	and task reporting

	* src/pandroid/agent/status.java: Checks if sim present
	and displays view accordingly.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-04 01:32:06 +00:00
mdtrooper d067f972ef 2012-07-03 Miguel de Dios <miguel.dedios@artica.es>
* ajax.php: added support for the enterprise, because some case
	this file can't call enterprise functions.
	
	* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.elements.php,
	godmode/reporting/visual_console_builder.editor.php,
	godmode/reporting/visual_console_builder.constans.php (delete),
	include/functions_visual_map_editor.php,
	include/ajax/visual_console_builder.ajax.php,
	include/functions_visual_map.php: some parts of code had been
	refactored because it is necesary for to add enterprise feature to
	Visual map.
	
	* include/constants.php: cleaned source code style and added and
	reordened the constants for visual maps.
	
	* include/functions_html.php, include/styles/pandora.css,
	include/functions_ui.php, include/functions.php, index.php: cleaned
	source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6732 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-03 15:39:37 +00:00
juanmanuelr 84e92a0eef 2012-07-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	 extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	 extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Replaced 
	 version in db scripts.
	 
	* 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: Delete old
	 named db scripts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6731 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-03 15:15:10 +00:00
juanmanuelr 40ee4b5d9e 2012-07-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
	 pandoradb.data.postgreSQL.sql
	 pandoradb.data.oracle.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: Added 
	 meta_style row in tconfig.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6730 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-03 11:58:23 +00:00
juanmanuelr efa096fcb2 2012-07-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Removed innecesary flags in some policy
	function calls.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-03 10:11:20 +00:00
santimunin b85c5a3b53 2012-07-03 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/IncidentListItem.java: Deleted, not necessary class.
	* src/pandroid_event_viewer/pandorafms/IncidentList.java: Deleted, not necessary class.	
	* src/pandroid_event_viewer/pandorafms/EventList.java: The event type images are now fetched from the application (not internet).
	* src/pandroid_event_viewer/pandorafms/Core.java: Added a method which returns the event type image.
	* res/res/drawable-ldpi/: Added some images.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6728 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-02 22:25:27 +00:00
juanmanuelr a614700114 2012-07-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/javascript/jquery.pandora.js: Changed size of modal 
	windows to avoid scroll.

	* include/functions_ui.php
	 include/functions.php: Changes in autorefresh. When user is not 
	 logged then don't autorefresh (except public url of visual console)
	 
	 index.php: Restrict get_parameter to post when password in renewed
	 in login.
	 
	 operation/visual_console/public_console.php: Fixed jquery path in
	 this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-07-02 11:11:21 +00:00
santimunin 47e5d5efa8 2012-06-30 Santiago Munín <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Added a check in order to prevent profile overwritings.
	* src/pandroid_event_viewer/pandorafms/Core.java: Added method which finds a string in a list (case insensitive).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6726 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-29 23:10:25 +00:00
santimunin e77d26b03d 2012-06-29 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java: Added a little hack to make it compatible with v4.0.2
	* res/layout/main.xml: Added a little hack to make it compatible with v4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6725 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-29 13:33:37 +00:00
mdtrooper e6479b2fea 2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: added lost lines for the text sizes
	into the function "config_process_config".
	
	* include/config_process.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6724 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-28 13:44:15 +00:00
mdtrooper 453c088c05 2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed into the function "copy_dir" when
	pass a empty string or bad directory for source.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-28 12:07:39 +00:00
santimunin 7dc20afc3c 2012-06-27 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Added "apipass" parameter to petitions.
	* src/pandroid_event_viewer/pandorafms/Options.java: Added an API Password entry. Now, after getting the API version, it is stored in SharedPreferences.
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java: Changed event parsing.
	* src/pandroid_event_viewer/pandorafms/API.java: Added some checks before parsing tags and groups.
	* res/values/strings.xml: Added new entries.
	* res/layout/options.xml: Added an API Password entry.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 15:37:10 +00:00
koichirok 25873bf1f2 2012-06-27 Koichio Kikuchi <koichiro@rworks.jp>
* pandora_console.redhat.spec: Changed php dependencies so that the
	 RPM package can be installed into RHEL/CentOS 5. Also removed unused
	 lines.

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6720 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 07:16:00 +00:00
koichirok efcd724c94 2012-06-27 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_server.redhat.spec: Small fixes: removed duplicated useradd
	 line, don't remove pandora user after uninstall, added collections
	 directory.

	Merged from 4.0 branch.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 07:02:52 +00:00
koichirok 9de54ccf84 2012-06-27 Koichiro Kikuchi <koichiro@rworks.jp>
* ChangeLog: Fixed log entry date of my previous commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6718 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 06:59:53 +00:00
koichirok dd1d074877 2012-06-21 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_agent.redhat.spec: Merged from 4.0 branch. Don't create
	 pandora user if already exists.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6717 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 06:54:08 +00:00
mdtrooper e291b77d96 2012-06-26 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: removed the dependency for "mysql-server" because
	the console can be in a machine without mysql server but it is
	necesary the mysql-client for backup process.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6715 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 14:12:17 +00:00
mdtrooper 97dab93bc6 2012-06-26 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: added mysql-server dependency.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6714 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 14:01:56 +00:00
juanmanuelr 358a07c7ed 2012-06-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events.php: Url tag compatible with IE9.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 09:08:27 +00:00
markholland b919233e4a 2012-06-26 Mark Holland <mark@mark-holland.me.uk>
* res/values/strings.xml: Added strings for 
	smsReceived, networkType, phoneType and calls.
	Replicated in values-en and values-es.

	* res/layout/setup.xml: Added checkboxes for simID
	and task reporting.

	* res/layout/status.xml: Added textviews for new data.

	* src/pandroid/agent/core.java: set simID
	reporting as disabled by default. Added variables
	for networkOperator, networkType, phoneType,
	signalStrength, incoming, missed and outgoing calls.

	* src/pandroid/agent/PandroidAgentListener.java: task,
	smsReceived, networkType, phoneType and calls methods
	and then added to XML. simID now checks whether
	enabled in user configuration.

	* src/pandroid/agent/setup.java: Added spinner for task
	selection.

	* src/pandroid/agent/SMSActivity.java: removed

	* src/pandroid/agent/SMSBroadcastReceiver.java: upon
	receiving a smsreceived intent, increments the stored
	number of smsReceived.

	* src/pandroid/agent/status.java: Added textviews for
	new methods mentioned above.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6708 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 00:47:47 +00:00
santimunin b5ca8b4a47 2012-06-26 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/API.java: Added new api calls.
	* src/pandroid_event_viewer/pandorafms/Core.java: Now connections can throw IOExceptions.
	* res/values/strings.xml: Added new entries.
	* src/pandroid_event_viewer/pandorafms/Options.java,
	  src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java,
      	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
      	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java,
      	  src/pandroid_event_viewer/pandorafms/EventList.java,
      	  src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java,
      	  src/pandroid_event_viewer/pandorafms/Main.java: Now a toast is shown if there was any connection problem.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6707 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 22:38:24 +00:00
mdtrooper f73aed8d7b 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: cleaned source code style.
	
	* include/functions_reporting.php: added subtype into the title
	in "Top N".
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 17:14:33 +00:00
santimunin 8d965c519c 2012-06-25 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java: Fixed a UI bug and refactorized the API call.
	* src/pandroid_event_viewer/pandorafms/API.java: Added create incident.
	* res/layout/main.xml: Little UI changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6702 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 15:40:26 +00:00
juanmanuelr 00fee81524 2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_visual_map.php
	 godmode/reporting/visual_console_builder.wizard.php
	 godmode/reporting/visual_console_builder.php: Visual console 
	 wizard 'item per agent' functionality. 

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 15:30:05 +00:00
juanmanuelr 6b37d757ac 2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/Core.pm: Added deletion of tags when a module is
	being deleted.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6700 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 15:20:23 +00:00
mdtrooper 0b3bc4b342 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_reporting.php,
	operation/agentes/status_monitor.php: cleaned source code style.
	
	* extensions/update_manager/load_updatemanager.php,
	extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/main.php: now the function "get_key"
	returns more info about error to get user key from execution of
	keygen, and the calls of this function show more info about the
	kind errors.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 13:17:05 +00:00