Commit Graph

5454 Commits

Author SHA1 Message Date
darode b86459d841 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* operatoin/tree.php: Fixed a bug related to html tag id
                with strange characters.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:48:49 +00:00
santimunin c7b37dce64 2012-06-11 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java,
	res/layout/main.xml: Now the advanced options' layout is GONE not INVISIBLE.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6489 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:09:09 +00:00
darode 27028ba81a 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_agents.php,
	operation/tree.php: Improved performance for
	tree view module tab.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:08:25 +00:00
santimunin fbb0318785 2012-06-11 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	res/layout/main.xml,
	res/layout/options.xml: Changed advanced filter from Options to Filter.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 14:46:18 +00:00
ramonn efaf54c47c 2012-06-11 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update version string in server
	  configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 14:01:16 +00:00
darode 81981fe709 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_agents.php,
	operation/tree.php: Improved tree view for module groups.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6481 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 12:57:53 +00:00
mdtrooper ae17ff04ec 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: cleaned source code style.
	
	* include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.editor.js: fixed the set
	status to items when change somethings that module or method to get
	status that agent to module status item.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 12:26:20 +00:00
vgilc 0c3d6c3305 2012-06-11 Vanessa Gil <vanessa.gil@artica.es>
* godmode/users/configure_user.php
	  operation/users/user_edit.php: Removed 'add extra policies'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 11:24:46 +00:00
mdtrooper 7bbe3bafc9 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* pandora_server/util/pandora_xml_stress.pl: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6476 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 10:25:58 +00:00
mdtrooper f6e725f19b 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_gd.php, include/graphs/fgraph.php:
	cleaned source code style.
	
	* include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.editor.php: fixed the
	strange behavior of the bars and bubbles in the editor.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 10:24:02 +00:00
darode 7f640bfcdd 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Include functions_gis.php file that
	was missing.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6473 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 09:46:57 +00:00
juanmanuelr c5bfc9d3b2 2012-06-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions.php: Added pass of check_referer by url to
	 solve problems with autorefresh functionality.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 08:09:30 +00:00
juanmanuelr 9e90a7e60f 2012-06-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php
	 operation/reporting/reporting_xml.php: Fixed XML items exportation
	 and item editor for alert agent and alert event.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 07:27:14 +00:00
slerena c391f0d7ac 2012-06-09 Sancho Lerena <slerena@artica.es>
* functions_config.php: Fixed API password problem when
	you try to set it blank.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-09 17:31:22 +00:00
darode afc7a2e9d6 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Improved performance of
	sub tree for policies tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 15:13:19 +00:00
darode ec82a6cfe2 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Improved performance of tree
	view for policies.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 14:14:40 +00:00
ramonn c05e8c9f98 2012-06-08 Ramon Novoa <rnovoa@artica.es>
* include/db/postgresql.php,
	  include/db/mysql.php,
	  include/db/oracle.php,
	  include/config_process.php,
	  include/functions_db.php,
	  operation/agentes/datos_agente.php: Merged from 4.0 branch. Fixed and
	  improved the history database feature.

	* include/graphs/fgraph.php: Merged from 4.0 branch. Protect against
	  accidental output that might corrupt an image.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:18:03 +00:00
darode d1fdb6d2d1 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/Core.pm: Fixed an error counting 
	unknown agents in groups.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:13:26 +00:00
darode ac01678efb 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_groups.php,
	include/functions_os.php,
	operation/tree.php: Fixed a problem with unknown agent
	counting.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:11:58 +00:00
zarzuelo c636a70be4 2012-06-08 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Create the android agent change 
	log file



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:52:07 +00:00
juanmanuelr 4608084d21 2012-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixed update of custom 
	graph items.
o


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:46:28 +00:00
jsatoh e899a68a77 2012-06-08 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php, godmode/setup/setup.php: Fixed that
	ACL with API access cannot be removed after once configured. (Merged
	from 4.0.2)
	Fixed multiple recording of list_ACL_IPs_for_API.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 07:57:53 +00:00
mdtrooper 26aa9f5400 2012-06-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php: fixed the modules
	name with white spaces...again in Pandora console..
	
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:43:32 +00:00
darode 023a834036 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
        operation/tree.php: Improved performance of tree
        view for modules, its not very good but now works...

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:29:00 +00:00
juanmanuelr cda37e3b16 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/menu.php: Hide not valid sections with metaconsole 
	 activated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:25:08 +00:00
juanmanuelr 463f0feb6d 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_minimal.css
	 operation/extensions.php
	 operation/menu.php
	 general/header.php
	 godmode/extensions.php: Hide not valid sections with metaconsole 
	 activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:22:38 +00:00
darode 3541c59e9a 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_os.php: Created this file.
        include/functions_groups,
        operation/tree.php: Fixed a bug related to search
        improved performance of OS tab for tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 11:44:08 +00:00
hkosaka a79d10b28f 2012-06-07 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_ui.php: Merged from 4.0.x: Fixed bug:
	string truncation did not always work for multi-byte
	characters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:54:03 +00:00
darode 3356ea7904 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php,
	include/functions_groups.php: Fixed some errors and 
	improved performance of group tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:24:05 +00:00
santimunin 358315f7e1 2012-06-06 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java: All api operations are now asynchronous.
	* res/layout/create_incident.xml: Progress circle next to groups spinner.
	* res/values/strings.xml: New entries.
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: New incident icon.
	* res/drawable-ldpi/incident.png: Added new icon


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 18:34:09 +00:00
santimunin 67a6bb4eac 2012-06-06 Santiago Munin <burnin1@gmail.com>
* Fixed wrong uploads (bin and gen directories).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:21:19 +00:00
santimunin ed4b19a0e9 2012-06-06 Santiago Munin <burnin1@gmail.com>
* AndroidManifest.xml: Added CreateIncidentActivity (new activity).
	* src/pandroid_event_viewer/pandorafms/Core.java: Added some getAgents and getGroups
	* res/values/strings.xml: Added new entries
	* res/values/arrays.xml: Added new entries
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: Added "Incidents" entry
	* res/layout/create_incident.xml: CreateIncidentActivity's layout.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:16:52 +00:00
juanmanuelr 5afc1612a4 2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php
	 pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
	 creation when metaconsole is activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:22:37 +00:00
vgilc 0e33d1f857 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php: Fixed bug:
	If the data type of module is string, don't export the data in format: table, Excel or CSV.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:13:12 +00:00
vgilc 3f6f4d777f 2012-06-05 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_modules.php: Fixed bug: When you
	copy a policy module, still liked to policy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:07:51 +00:00
vgilc 46c286b8ea 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php
	  operation/agentes/exportdata.csv.php
	  operation/agentes/exportdata.excel.php: Fixed bug export
	data: If you choose first the type of export, the chosen 
	agent modules are not loaded into the page.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:05:33 +00:00
hkosaka e0fabc8d61 2012-06-06 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/planned_downtime.php: fixed that 'Affect'
	column at 'planned downtime' may show bad values. cleaned
	source code style.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 07:55:31 +00:00
darode 75fa702e45 2012-06-05 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a missing group icons
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-05 12:49:17 +00:00
juanmanuelr 29ec5ae23a 2012-06-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php: Fixed function search_agent when 
	metaconsole is activated an one of the nodes return no agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 14:18:21 +00:00
vgilc 51730d71f1 2012-06-04 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alert_list.list.php: Fixed bug: 
	Standard user can not add actions to an alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 13:48:00 +00:00
zarzuelo 4984b4a40b 2012-06-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions_io.php: Added new safe string function
	to scape strings to use it in regular expressions and
	change the parameters of enterprise functions to be
	compatible con last changes
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 09:05:32 +00:00
vgilc 59f8fc9346 2012-06-04 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/os.list.php: Fixed bug: you can delete
	operating systems defined by default in the installation.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 08:10:26 +00:00
juanmanuelr 54d932a7dd 2012-06-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/min.png
	 images/max.png
	 images/sum.png
	 images/avg.png: Changed operators images in Global wizard report. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6406 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 07:42:34 +00:00
santimunin a8cf523926 2012-06-01 Santiago Munin <burnin1@gmail.com>
* AndroidManifest.xml: Added IncidenList (new activity)
	* src/pandroid_event_viewer/pandorafms/IncidentListItem.java: Added, value object of incidents.
	* src/pandroid_event_viewer/pandorafms/IncidentList.java: New activity. It will show all incidents.
	* src/pandroid_event_viewer/pandorafms/Options.java: Little refactoring.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Deprecated function removed.
	* res/layout/item_list_incident_layout.xml: Layout of IncidentList items.
	* res/values/strings.xml: Added new entries.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 16:56:35 +00:00
santimunin 24b2e8363a 2012-06-01 Santiago Munín <burnin1@gmail.com>
* Little changes on the whole app: Fixed some Lint errors.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 13:48:48 +00:00
juanmanuelr b57af4bd65 2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed agent autocomplete
	in alert builder.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 13:31:52 +00:00
santimunin 54ac6c9231 2012-06-01 Santiago Munin <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java: Added image setting methods.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Removed image setting methods.
	* res/layout/item_list_event_layout.xml: Removed not needed ImageViews.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6401 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 12:30:33 +00:00
juanmanuelr 9135d9dece 2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed group recursion 
	checkbox in massive module edition.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 11:12:39 +00:00
santimunin 11d52ed0b7 2012-06-01 Santiago Munín <burnin1@gmail.com>
* src/pandroid_event_viewer/pandorafms/EventList.java: Now Agent's link points to mobile console.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 10:33:11 +00:00
zarzuelo c47e3b2037 2012-06-01 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Added units to
	module massive editor and missed help bubble in the same
	editor to post process field
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-01 07:49:08 +00:00