Commit Graph

6932 Commits

Author SHA1 Message Date
zarzuelo dd45550824 2013-07-22 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/stat_win.php: Change the order of jquery
	include file to avoid errors



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8553 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-22 12:34:46 +00:00
zarzuelo 489bde82e8 2013-07-22 Sergio Martin <sergio.martin@artica.es>
* include/graphs/flot/pandora.flot.js: Fixed access to 
	events from graphics in metaconsole for bug #2335



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8552 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-22 11:34:39 +00:00
zarzuelo 90c898d8c4 2013-07-22 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_module_interval_factor.php
	include/help/es/help_module_interval_factor.php
	godmode/agentes/module_manager_editor_common.php: Change the
	input field of module interval on data modules form by 
	a non editable info and improve the help explaining deeply the
	way of change the interval and how to do it. For bug #2308

	* images/cancel.png
	godmode/massive/massive_operations.php: Add missed icon
	and change another one




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-22 07:31:22 +00:00
zarzuelo 1e69288420 2013-07-19 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_delete_profiles.php: Fix massive
	deletion of profiles (ajax retrieving) for bug #2309



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-19 08:25:53 +00:00
zarzuelo ac60cce2a2 2013-07-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php: Add check to avoid SQL
	errors when retrieve alerts and the user profiles
	are not properly configurated for bug #2349



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-18 13:12:42 +00:00
zarzuelo bf97f65fea 2013-07-18 Sergio Martin <sergio.martin@artica.es>
* operation/reporting/reporting_viewer.php
	images/report_list.png
	godmode/events/event_edit_filter.php
	godmode/reporting/reporting_builder.php: Fix the manage
	tabs wich appeared in the view report section even when 
	the user hasnt RW permissions for bug #2347
	Added some new buttons and icon to make more usable the
	reports section



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8544 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-18 09:50:35 +00:00
zarzuelo 80d31f9b33 2013-07-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Fixed the access to the
	module graph from events view on metaconsole for bug
	#2344



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8543 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-18 09:28:57 +00:00
ramonn c1db54719f 2013-07-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Do not execute more than one alert per trap.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 17:40:08 +00:00
ramonn 0c36881c3e 2013-07-17 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	  godmode/snmpconsole/snmp_alert.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql: Added support for SNMP alert ordering.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8540 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 17:39:27 +00:00
zarzuelo c4ad9890b6 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php
	include/functions_groups.php
	operation/events/events_list.php: Fixed the visibility
	of the users in the events view filter. Now the user 
	can only filter by the users of the groups where the
	user belongs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 16:14:52 +00:00
zarzuelo d7f6584ffa 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* operation/menu.php
	operation/events/events_rss.php
	operation/events/export_csv.php
	operation/events/events_list.php
	operation/events/events.php
	operation/events/events.build_query.php
	general/shortcut_bar.php: Fixed group filter
	for bug #2346 and clean a lot of events code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 15:58:15 +00:00
zarzuelo aeb3b928e3 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_list.php: Delete unnecessary ACL 
	check

	* images/up.png: Add missed image to new styles




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8537 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 13:57:44 +00:00
mdtrooper 6eb071f615 2013-07-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the default value for
	"prediction_module" in tagente_module.
	
	* include/graphs/functions_flot.php,
	include/graphs/functions_pchart.php,
	include/graphs/functions_gd.php, include/graphs/functions_utils.php,
	include/javascript/pandora_alerts.js,
	include/javascript/pandora_modules.js,
	include/javascript/pandora_events.js,
	include/functions_network_components.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8535 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 11:12:37 +00:00
zarzuelo fdc49c33ad 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/status_monitor.php
	operation/agentes/alerts_status.php
	godmode/alerts/configure_alert_template.php: Clean 
	useless ACL checks. Change header string by the same
	string but translated. Added to the alert templates
	wizard level combo the option No Wizard to avoid
	confussing



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 10:31:31 +00:00
zarzuelo 429f54a408 2013-07-17 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/planned_downtime.editor.php
	godmode/menu.php: Fix a planned downtime ACLS problem
	for bug #2305



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8533 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-17 08:15:22 +00:00
ramonn 38258fc362 2013-07-16 Ramon Novoa <rnovoa@artica.es>
* include/functions_snmp_browser.php: Use version 2c by default. Some
	  OIDs may not be available for version 1 queries.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8531 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 18:07:18 +00:00
zarzuelo b0db2b309a 2013-07-16 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_delete_alerts.php: Fixed an 
	ajax call to retrieve the agents associated to an alert 
	template in massive alerts deletion for bug #2282



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8530 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 16:23:54 +00:00
zarzuelo 7bd8fc58f5 2013-07-16 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/agent_wizard.snmp_explorer.php
	godmode/agentes/configurar_agente.php: Add missing 
	javascript to show snmp v3 options and other little
	fixes and improvements

	* godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/reporting_builder.item_editor.php
	godmode/netflow/nf_edit_form.php
	godmode/netflow/nf_item_list.php: Deleted homedir from sec2
	in url links due old system of reuse code from metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8529 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 15:14:57 +00:00
mdtrooper 2293311b73 2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
	include/javascript/jquery.pandora.controls.js: improved the
	functions to pass the php vars to js, now it supports json.
	
	* include/javascript/d3.v3.js: added this library for to make
	beautiful things.
	
	* include/functions_ui.php, include/graphs/fgraph.php,
	include/javascript/pandora_events.js, include/javascript/pandora.js,
	include/functions_treeview.php,
	include/include_graph_dependencies.php,
	include/functions_categories.php, include/db/postgresql.php,
	include/db/oracle.php, include/db/mysql.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 14:13:23 +00:00
mdtrooper 9eb1c2482b 2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js,
	include/functions_networkmap.php, include/constants.php,
	include/ajax/agent.php, include/ajax/events.php: improve the
	source code and remove the magic number and they changed for
	constants.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8527 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 09:09:50 +00:00
zarzuelo 403305b49b 2013-07-15 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/configurar_agente.php: Fixed javascript 
	dinamic positioning of layers in subtab code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8525 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-15 13:22:23 +00:00
zarzuelo 7972ba3543 2013-07-15 Sergio Martin <sergio.martin@artica.es>
* util/plugin/snmp_remote.pl: Add SNMP remote plugin to the
	default plugins on Pandora FMS server



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8524 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-15 12:07:10 +00:00
zarzuelo f098564c05 2013-07-15 Sergio Martin <sergio.martin@artica.es>
* include/languages/cs.po
	include/languages/et.mo
	include/languages/pt_BR.po
	include/languages/nl.mo
	include/languages/es.po
	include/languages/pl.mo
	include/languages/ko.po
	include/languages/it.mo
	include/languages/sl.mo
	include/languages/sk.po
	include/languages/uk.po
	include/languages/pt.mo
	include/languages/ro.po
	include/languages/en_AU.mo
	include/languages/ast.mo
	include/languages/bg.mo
	include/languages/index.pot
	include/languages/bn.po
	include/languages/nb.po
	include/languages/cs.mo
	include/languages/en.po
	include/languages/ar.po
	include/languages/pt_BR.mo
	include/languages/es.mo
	include/languages/ko.mo
	include/languages/fr.po
	include/languages/sk.mo
	include/languages/uk.mo
	include/languages/ro.mo
	include/languages/mr.po
	include/languages/ca.po
	include/languages/da.po
	include/languages/tr.po
	include/languages/sv.po
	include/languages/de.po
	include/languages/ja.po
	include/languages/zh_TW.po
	include/languages/nb.mo
	include/languages/bn.mo
	include/languages/he.po
	include/languages/fi.po
	include/languages/ar.mo
	include/languages/en.mo
	include/languages/hi.po
	include/languages/zh_CN.po
	include/languages/fr.mo
	include/languages/te.po
	include/languages/eu.po
	include/languages/en_GB.po
	include/languages/mr.mo
	include/languages/hu.po
	include/languages/ca.mo
	include/languages/da.mo
	include/languages/tr.mo
	include/languages/de.mo
	include/languages/sv.mo
	include/languages/ru.po
	include/languages/ja.mo
	include/languages/zh_TW.mo
	include/languages/he.mo
	include/languages/fi.mo
	include/languages/hi.mo
	include/languages/zh_CN.mo
	include/languages/el.po
	include/languages/gl.po
	include/languages/te.mo
	include/languages/eu.mo
	include/languages/en_GB.mo
	include/languages/et.po
	include/languages/hu.mo
	include/languages/nl.po
	include/languages/pl.po
	include/languages/it.po
	include/languages/sl.po
	include/languages/pt.po
	include/languages/ru.mo
	include/languages/en_AU.po
	include/languages/ast.po
	include/languages/bg.po
	include/languages/el.mo
	include/languages/gl.mo: Upgrade the languages
	from launchpad

	* pandoradb_data.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	godmode/agentes/agent_wizard.wmi_explorer.php
	godmode/agentes/agent_wizard.snmp_explorer.php
	godmode/agentes/agent_wizard.php
	godmode/agentes/configurar_agente.php: Added SNMP wizard
	on Agent Wizards subtab



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-15 11:55:44 +00:00
mariopulido87 691605b3ae 2013-07-11 Mario Pulido <mario.pulido@artica.es>
* include/help/en/help_snmp_alert_field1.php,
        include/help/es/help_snmp_alert_field1.php: Modified Help. Added Macros



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8518 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-11 13:59:59 +00:00
mdtrooper 8db370ba28 2013-07-11 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed overwrite the fields
	custom_string_* and custom_integer_* of module when update and
	these fields haven't a new value.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-11 13:10:01 +00:00
zarzuelo b535f03d22 2013-07-11 Sergio Martin <sergio.martin@artica.es>
* include/graphs/pChart/pPie.class.php: Fix the colors of the
	legend when we want to have legend of data that not appears
	in the pie. Merge from 4.1

	* operation/users/user_edit.php: Fix repeated select control
	for main page in workspace section

	* godmode/servers/modificar_server.php: Fix crash in
	servers view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8516 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-11 11:11:16 +00:00
zarzuelo eb7ada05c5 2013-07-11 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Change Data by Avg on graphs legends
	Ramon changed it few weeks ago, but I broke his job. Sorry



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-11 08:26:46 +00:00
mdtrooper 995cda4b1e 2013-07-11 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/operation/agent.php,
	include/functions_graph.php: fixed the show static graphs in
	mobile.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8513 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-11 08:15:48 +00:00
ramonn 454db840e5 2013-07-10 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	  godmode/snmpconsole/snmp_alert.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  operation/snmpconsole/snmp_view.php: Added support to filter 10
	  binding vars. Added binding var automatic translation and other
	  small improvements.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8511 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 16:49:05 +00:00
ramonn 5cd2e75710 2013-07-10 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support to filter 10 binding vars.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 16:43:25 +00:00
mdtrooper 7ae626eb9a 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php: fixed lost semicolon.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8509 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 16:11:15 +00:00
mdtrooper 16b352e0ad 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
* unix/NT4/pandora_agent.conf, pc/NT4/pandora_agent.conf: set the
	remote_config to 0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8508 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 10:22:55 +00:00
ramonn ad730752b5 2013-07-10 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Changed the regexp used to retrieve ip addresses to
	  avoid locale related problems.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 10:08:52 +00:00
ramonn 5dd055457b 2013-07-10 Ramon Novoa <rnovoa@artica.es>
* util/pandora_db.pl: Ignore reports if the metaconsole is enabled, since
	  agents are never local.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8504 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 09:27:21 +00:00
mdtrooper f1a3a453ca 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components.php: improved the source
	code style.
	
	* include/functions_modules.php: added lost function
	"modules_get_type_id".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-10 08:46:51 +00:00
zarzuelo dcf07af0a8 2013-07-09 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fix the alerts status pie graph
	to make it more usefull

	* godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: Comment
	code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-09 09:44:11 +00:00
mdtrooper ba37e0195b 2013-07-09 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/PredictionServer.pm, util/pandora_xml_stress.pl:
	improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-09 09:28:10 +00:00
zarzuelo da02dd973a 2013-07-09 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
	images/wand_agent.png
	images/wand_snmp.png
	images/wand_wmi.png
	images/wand_interfaces.png
	godmode/agentes/agent_wizard.php
	godmode/agentes/configurar_agente.php: Add new subtab to
	agent wizard



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-09 07:39:14 +00:00
zarzuelo c02322b1f3 2013-07-08 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js
	include/functions_wmi.php
	extensions/snmp_explorer.php
	godmode/agentes/agent_wizard.wmi_explorer.php
	godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
	godmode/agentes/agent_wizard.php
	godmode/agentes/configurar_agente.php: Replace the SNMP explorer by 
	the Agent wizard with two initial sections. SNMP interfaces explorer
	and WMI explorer




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-08 11:06:44 +00:00
mdtrooper 0cdc44c274 2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/modules.php, mobile/include/style/main.css:
	yes another fixes.
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8494 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-08 10:59:07 +00:00
mdtrooper c52995125a 2013-07-08 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/alerts.php, mobile/operation/events.php,
	mobile/operation/modules.php, mobile/operation/networkmaps.php,
	mobile/operation/agents.php, mobile/include/ui.class.php,
	mobile/include/style/main.css: some fixes.
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-08 10:15:49 +00:00
mdtrooper fa4033c4a9 2013-07-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_events.php: erased lost debug trace.
	
	* mobile/operation/events.php: some fixes in the pagination, and
	now the events from the system show the name "system".
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 14:29:35 +00:00
ramonn be5f351268 2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added macros _snmp_oid_ and _snmp_value_ to
	  SNMP alerts. Changed the behaviour of _snmp_fx_ to act as filters
	  and not as user defined macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 14:20:34 +00:00
mdtrooper 0e5ee5c580 2013-07-05 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/include/style/main.css: some
	fixes.
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8484 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 11:28:29 +00:00
zarzuelo 07925f3c50 2013-07-05 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/PluginServer.pm: Fixed subst_alert_macros assignation
	to variable.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 10:15:41 +00:00
ramonn 40cd8e5c44 2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Exported subst_alert_macros. Added support
	  for an arbitrarily large number of _snmp_fx_ macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8481 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:56:08 +00:00
ramonn 15396dd458 2013-07-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/PluginServer.pm: Added agent and module macros to
	  plugins.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8480 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:45:47 +00:00
hkosaka 58f62b2621 2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: Small changes. Make
	alert action list sorted (in the same order of extra action
	list that appears at the defined alert list)

	Merged from branch 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 09:12:07 +00:00
hkosaka dc94b30e48 2013-07-05 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/alerts/alert_list.builder.php: When creating new
	alert, wrong action might be assigned to the alert (if you had
	some deleted actions in the past).

	Merged from branch 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-05 08:28:48 +00:00
mdtrooper f7e0327b78 2013-07-04 Miguel de Dios <miguel.dedios@artica.es>
* mobile/include/style/images/*,
	mobile/include/style/jquery.mobile-1.3.1.css,
	mobile/include/javascript/jquery.js, 
	mobile/include/javascript/jquery.mobile-1.3.1.js: added the
	jquery mobile, and made some changes in the css.
	
	* mobile/include/style/main.css, mobile/operation/agents.php,
	mobile/include/ui.class.php: some fixes.
	
	MERGED FROM THE BRANCH 4.0.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-04 16:55:39 +00:00