Commit Graph

7407 Commits

Author SHA1 Message Date
mdtrooper 1ff6dd9d80 2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the get events when not found the
	agent, before it returned the systems events, now it returns empty
	list.
	
	MERGED FROM THE BRANCH PANDORA_4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 14:00:51 +00:00
darode 7b9beb64cb 2013-12-05 Dario Rodriguez <dario@artica.es>
* mobile/operation/agents.php: Removed a filter option which 
        didn't work.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 13:53:07 +00:00
mdtrooper db0028003c 2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/Main.java: fixed to check the
	pandora version for 4 series, this is for to hidden the tag filter.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9166 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 11:28:34 +00:00
mdtrooper b26855992c 2013-12-05 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/API.java: fixed the offset
	parameter for the api.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9165 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 10:32:55 +00:00
pandora-release 1c0ed8b725 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-05 00:35:21 +00:00
mdtrooper 5b1e03dee1 2013-12-04 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/Main.java: fixed java
	warnings.
	
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
	fixed the hack for old pandoras.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-04 16:50:05 +00:00
mdtrooper 6bc5a6c8d2 2013-12-04 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/About.java: removed the
	unused import.
	
	* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/values-ja/strings.xml, res/values/strings.xml,
	res/values-es/strings.xml: fixed the text to show when the
	event is a recon.
	
	* AndroidManifest.xml: incremented the version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9161 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-04 15:52:27 +00:00
pandora-release a79baa34dc Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-04 00:37:21 +00:00
jsatoh de06b3d8e2 2013-12-03 Junichi Satoh <junichi@rworks.jp>
* include/functions_treeview.php: Fixed sql error in tag tab.

	* ChangeLog: Fixed date in my previous commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-03 09:47:07 +00:00
pandora-release c2c29b7254 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9152 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-03 00:35:25 +00:00
jsatoh d7e2cd27ee 2013-12-01 Junichi Satoh <junichi@rworks.jp>
* include/functions_treeview.php: Fixed tree expansion failure
	by module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-02 10:43:14 +00:00
mdtrooper 56fd471b8e 2013-12-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the old visual maps from
	pandora4, now it is showed the values in the simple value.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-02 08:07:40 +00:00
pandora-release 783e0d118c Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9149 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-02 00:34:47 +00:00
jsatoh 4c620bc523 2013-12-01 Junichi Satoh <junichi@rworks.jp>
* include/functions_modules.php: Corrected agent counting by module
	group.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-01 02:17:12 +00:00
pandora-release 47a6d8b06a Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9146 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-01 00:33:51 +00:00
jsatoh a4dcbdb336 2013-11-30 Junichi Satoh <junichi@rworks.jp>
* operation/tree.php, operation/agentes/datos_agente.php,
	operation/reporting/reporting_viewer.php,
	operation/reporting/graph_viewer.php: Added missing extension for
	jquery-ui-timepicker.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-30 12:14:26 +00:00
jsatoh 6005595aa4 2013-11-30 Junichi Satoh <junichi@rworks.jp>
* include/functions_treeview.php: Fixed tree expansion failure in
	module based tree view when module name includes some symbols.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-30 08:32:15 +00:00
pandora-release 605013b0f3 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-30 00:33:28 +00:00
pandora-release 50e8df72bf Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-29 00:33:15 +00:00
zarzuelo f93c3a6d31 2013-11-28 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css
	mobile/operation/networkmap.php
	mobile/operation/home.php
	mobile/operation/modules.php
	mobile/operation/alerts.php
	mobile/operation/networkmaps.php
	mobile/operation/agent.php
	mobile/operation/groups.php
	mobile/operation/agents.php
	mobile/operation/events.php
	mobile/operation/tactical.php: General improvements
	in mobile console. Cut some large strings, style fixes,
	back button path fix to iPhone app...



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-28 16:54:18 +00:00
pandora-release 95e26c83a0 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-28 00:35:16 +00:00
zarzuelo 65a99038f1 2013-11-27 Sergio Martin <sergio.martin@artica.es>
* images/hourglass_dark.png
	images/star_white.png
	images/star_dark.png
	images/hourglass_white.png
	images/tick_dark.png
	images/tick_white.png
	mobile/include/style/main.css
	mobile/operation/agent.php
	mobile/operation/events.php: Improvements in event 
	viewer of mobile console after fix some conflictive 
	code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9136 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-27 16:54:53 +00:00
jsatoh b1e82c8b28 2013-11-27 Junichi Satoh <junichi@rworks.jp>
* include/functions_modules.php: Fixed that some multibyte characters
	are recognized as invalid characters on module creation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-27 04:43:14 +00:00
pandora-release baa2b593ee Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9133 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-27 00:33:27 +00:00
zarzuelo d0f2020b47 2013-11-26 Sergio Martin <sergio.martin@artica.es>
* pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
	pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java: Clean old debug messages
	and fix version detection for use new API functions on SP1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 13:10:44 +00:00
zarzuelo 7be262505b 2013-11-26 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php
	mobile/include/style/main.css: Improve events layout
	and fix events validation 
	
	* include/functions_events.php
	include/functions_api.php: Fix event validation from API
	and delete deprecated function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 13:08:27 +00:00
koichirok 6f4d27af65 2013-11-26 KIKUCHI Koichiro <koichiro@rworks.jp>
* extensions/insert_data.php: Use UTF-8 for output XML encoding.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9130 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 11:20:59 +00:00
koichirok afc74d06b9 2013-11-26 KIKUCHI koichiro <koichiro@rworks.jp>
* util/pandora_remote_agent.sh: Added "-e" option to be able to
	 specify character encoding of the output XML. Also added PID
	 number to the output file name to avoid race conditions.
 


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9128 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 10:56:49 +00:00
koichirok e0c47a6c3e 2013-11-26 KIKUCHI Koichiro <koichiro@rworks.jp>
* extensions/insert_data.php: Fixed a date time format used for
	 single data insertion.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9127 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 08:24:32 +00:00
pandora-release 6995cea86c Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9126 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-26 00:33:05 +00:00
koichirok 13df28711f 2013-11-26 KIKUCHI koichiro <koichiro@rworks.jp>
* lib/PandoraFMS/DB.pm: Fixed get_agent_status to return warning status
	 correctly.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9125 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-25 22:03:07 +00:00
ramonn 0c5811bd77 2013-11-25 Ramon Novoa <rnovoa@artica.es>
* res/values/strings.xml,
	  res/values-es/strings.xml: Updated some strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9124 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-25 11:57:39 +00:00
mdtrooper 2e775f2145 2013-11-25 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml,
	src/pandroid_event_viewer/pandorafms/Options.java: updated lost
	changes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9123 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-25 11:46:31 +00:00
pandora-release e1b3602b78 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9121 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-25 00:32:03 +00:00
pandora-release 9d4c603c56 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-24 00:32:14 +00:00
jsatoh bac4c977c4 2013-11-23 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_visual_console_editor_editor_tab.php: Added
	a new description for rich label.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9118 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-23 12:19:19 +00:00
pandora-release 12b00f3fc2 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9116 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-23 00:31:56 +00:00
zarzuelo 7ffc15ddb6 2013-11-22 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php
	mobile/include/style/main.css
	mobile/include/ui.class.php: Improve events view
	of mobile console



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9115 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-22 13:24:28 +00:00
mdtrooper 858a46936b 2013-11-22 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php: fixed the get size of icons for
	the public gis map.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9114 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-22 09:56:40 +00:00
pandora-release dc853d7f63 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9112 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-22 00:31:30 +00:00
zarzuelo c662602e2c 2013-11-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Fix the combo of user to assign an
	event to one of them. Incident #409



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9111 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-21 14:55:23 +00:00
zarzuelo a092623706 2013-11-21 Sergio Martin <sergio.martin@artica.es>
* godmode/modules/manage_network_components_form.php: Fixed jquery
	code that broke the snmp3 fields when edit a snmp component
	Incident #402



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9110 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-21 11:37:41 +00:00
pandora-release becb192d64 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9108 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-21 00:32:58 +00:00
mdtrooper eab33549b4 2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: removed the hack for metaconsole, now
	this hack fails because it is fixed the images in the metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9107 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 16:57:53 +00:00
mdtrooper 58f58b0b50 2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: removed the hack for metaconsole in the
	"ui_toggle", now this hack fails because it is fixed the images in
	the metaconsole.
	
	* operation/agentes/alerts_status.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9106 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 14:52:14 +00:00
mdtrooper f760ee7112 2013-11-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/configure_group.php, godmode/groups/group_list.php:
	fixed the show and edit groups with the ACL of the user has not
	access to the parent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9105 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 13:14:12 +00:00
zarzuelo eb4c8dbc40 2013-11-20 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Fix new events load condition
	to be loaded only when down scroll



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9104 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 10:03:31 +00:00
zarzuelo 643c1b6103 2013-11-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php: Fixed visual console links
	to other visual consoles when there are alert fired on them
	for bug #391



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9103 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 08:56:31 +00:00
pandora-release 201c192e97 Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9101 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-20 00:30:51 +00:00
ramonn 8ddd17bd30 2013-11-19 Ramon Novoa <rnovoa@artica.es>
* godmode/reporting/reporting_builder.php,
	  include/functions_groups.php,
	  include/functions_users.php: Reverted changes for TSOL. Will be merged
	  after the 5.0SP1 release.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9100 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-19 16:21:42 +00:00