Commit Graph

6242 Commits

Author SHA1 Message Date
juanmanuelr 620981e9d1 2013-01-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Fixed bug
	in prediction modules editor.
	
	Merged from braches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 10:35:10 +00:00
zarzuelo 949650deb2 2013-01-09 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	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:
	Add profile tags to the database structure

	* include/ajax/events.php
	include/functions.php
	include/functions_events.php
	include/functions_reporting.php
	include/functions_treeview.php
	include/functions_profile.php
	include/constants.php
	include/functions_tags.php
	operation/tree.php
	operation/users/user_edit.php
	operation/events/events_list.php
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	godmode/users/configure_user.php: Add new acl control with
	tags in events and tree views. Fix a lot of little bugs like ACLs
	in tree view (tags mode), add the tags mode on tree view of the normal 
	console, pass the ACL flag to some forgotten functions, etc.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 09:25:07 +00:00
jsatoh b5e0442b9a 2013-01-09 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_reporting_advanced_tab.php: Translated
	description for _REPORT_NAME_ into Japanese.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 07:18:38 +00:00
hkosaka 395dddf359 2013-01-09 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Fixed that the console sometimes shows
	negative timestamp (e.g. '-2 sec') when using 'comparison in
	roll-over' format.  Merged from 4.0.x.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 01:48:47 +00:00
mdtrooper d4f7e9c254 2013-01-08 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_db.pl: fixed the SQL query for the checking modules
	status count.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 17:56:32 +00:00
darode 8417ad0c22 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* extensions/system_info.php: Added link to download System info file.

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 17:50:54 +00:00
juanmanuelr fc9908cb26 2013-01-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/agent_template.php: Fixed duplication of modules
	when template is applied several times. 
	
	Bug id: #3599442



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 15:59:23 +00:00
juanmanuelr 5d5e8e4aeb 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/agent_template.php: Fixed duplication of modules
	when template is applied several times. 
	
	Bug id: #3599442



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 15:36:33 +00:00
darode cea90b747a 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: changed text from Libray to Library



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:19:20 +00:00
darode 85f09c4729 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: Fixed a problem with link to module
	library because in trunk version there is an additional field to search
	modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:17:16 +00:00
darode d206125313 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/reporting_builder.php: Added a default cover
	for PDF reports.
	include/help/ja/help_reporting_advanced_tab.php,
	include/help/en/help_reporting_advanced_tab.php,
	include/help/es/help_reporting_advanced_tab.php: Documented new macro
	called REPORT_NAME

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:05:14 +00:00
darode 2a9e758f10 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: Added a link to module library
	in create module view.

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 08:32:44 +00:00
hkosaka ad2f76187f 2013-01-07 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/reporting/graph_builder.php: Fixed bug that
	unspecified graph name was displayed in the header line
	when creating a new custom graph. Merged from branch 4.0.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-07 09:59:56 +00:00
jsatoh 204bca886e 2013-01-07 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_macros.php: Added macro _email_tag_.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-07 08:53:53 +00:00
slerena 285d741b2c 2013-01-05 Sancho Lerena <slerena@artica.es>
* include/styles/pandora.css: Fixed footer problem
        in Chrome. 




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-05 12:37:16 +00:00
juanmanuelr c39bdebce9 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/config_process.php: Removed php notice in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-04 11:30:55 +00:00
juanmanuelr 032958b443 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_alert_macros.php
	 include/help/es/help_alert_macros.php: Added macro _email_tag_
	 to these help screens.
	* include/functions_reports.php: Added exception to templates when
	report types are displayed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-04 09:58:13 +00:00
mdtrooper d99abb39bb 2013-01-03 Miguel de Dios <miguel.dedios@artica.es>
* extensions/resource_registration.php,
	extensions/resource_exportation.php,
	operation/events/event_statistics.php,
	operation/events/events_list.php,
	operation/reporting/reporting_viewer.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	include/functions_alerts.php, include/functions_reports.php,
	include/functions_events.php, include/graphs/fgraph.php,
	include/functions_graph.php, include/styles/pandora.css,
	include/functions_reporting.php, include/functions_agents.php: a lot
	of changes and fixes from the branch for the reports.
	
	MERGED FROM PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-03 18:52:21 +00:00
juanmanuelr 6007bf45ea 2013-01-02 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: Added email
	 field to ttag table.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-02 12:26:48 +00:00
juanmanuelr 95bb5f9662 2013-01-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* lib/PandoraFMS/Core.pm: Added macro _email_tag_ to replace with
	emails associated to module tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-02 10:15:11 +00:00
juanmanuelr 113af526f8 2012-12-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/tag/tag.php
	 godmode/tag/edit_tag.php: Tag editor compatible with metaconsole.
	 


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-31 09:02:10 +00:00
juanmanuelr 8ecf77c78b 2012-12-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixes in template
	metaconsole editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-31 08:41:52 +00:00
juanmanuelr 478de7caf3 2012-12-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql: Added new column email to ttag table.


	* include/styles/pandora.css: Fixed loading class.

	* include/functions_api.php: Fixed get_all_agents api function. 
	 
	* include/functions_ui.php
	include/javascript/pandora.js: Improvement in agent_autocomplete
	function.
	
	* operation/reporting/reporting_viewer.php
	godmode/reporting/reporting_builder.php
	godmode/reporting/reporting_builder.item_editor.php: Fixes in report
	viewer for metaconsole.
	
	* godmode/tag/tag.php
	godmode/tag/edit_tag.php: Added email fields in editors.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-31 08:01:28 +00:00
zarzuelo c731e11a2b 2012-12-28 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	include/functions_users.php
	include/functions_visual_map.php
	include/ajax/skins.ajax.php
	include/ajax/events.php
	include/functions_custom_graphs.php
	include/functions.php
	include/functions_agents.php
	include/functions_graph.php
	include/functions_events.php
	include/functions_reporting.php
	include/functions_config.php
	include/functions_reports.php
	operation/visual_console/render_view.php
	operation/agentes/exportdata.php
	operation/menu.php
	operation/events/event_statistics.php
	operation/events/events_rss.php
	operation/events/export_csv.php
	operation/events/sound_events.php
	operation/events/events_list.php
	operation/events/events_marquee.php
	operation/events/events.php
	operation/reporting/reporting_viewer.php
	pandoradb.data.postgreSQL.sql
	pandoradb.data.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
	general/main_menu.php
	godmode/menu.php
	godmode/events/event_edit_filter.php
	godmode/events/events.php
	godmode/events/event_filter.php
	godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/graph_builder.main.php
	godmode/reporting/visual_console_builder.wizard.php
	godmode/reporting/visual_console_builder.php
	godmode/reporting/reporting_builder.main.php
	godmode/reporting/visual_console_builder.data.php
	godmode/reporting/visual_console_builder.elements.php
	godmode/reporting/graph_builder.php
	godmode/reporting/graph_builder.graph_editor.php
	godmode/reporting/reporting_builder.php
	godmode/reporting/visual_console_builder.editor.php
	godmode/reporting/reporting_builder.item_editor.php
	godmode/reporting/graphs.php: Change all the event and reporting
	acl control to new flags ER,EW,EM,RR,RW,RM



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-28 17:06:17 +00:00
hkosaka a643fa98c3 2012-12-28 Hirofumi Kosaka <kosaka@rworks.jp>
* util/pandora_manage.pl: Added operation logging by
	logger() with verbose level 10.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7340 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-28 08:26:49 +00:00
juanmanuelr 7c8dfbd28b 2012-12-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reports.php: Hide inventory changes report in
	temaplate functionality.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-27 10:16:21 +00:00
hkosaka 8756fb8eff 2012-12-27 Hirofumi Kosaka <kosaka@rworks.jp>
* general/logon_ok.php: Fixed typo. (fixed a bug that the
	number of "Alerts defined" at Pandora Main Page showed always "-")
	Merged from branch 4.0.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-27 08:24:11 +00:00
juanmanuelr f2855e507b 2012-12-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Fixed typos.
	* operation/reporting/reporting_viewer.php: Fixed range selector
	in report viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-26 16:43:05 +00:00
mdtrooper 16a0b832ac 2012-12-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: erased double check for admin user
	in action to update config.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-26 14:56:32 +00:00
zarzuelo 4e47872140 2012-12-26 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	pandoradb.data.postgreSQL.sql
	pandoradb.data.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/profile_list.php
	godmode/users/configure_profile.php: Added to the
	database and editor new reporting and events ACL flags



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7331 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-26 12:16:39 +00:00
Ramon Novoa d4196780e3 2012-12-24 Ramon Novoa <rnovoa@artica.es>
* bin/pandora_server: Re-calculate module status count upon server
          startup.

        * util/pandora_db.pl: Use new not-init status for module status count
          calculation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7326 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-24 12:15:51 +00:00
Ramon Novoa 0165f07bf0 2012-12-21 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/agent_template.php,
	  godmode/agentes/configurar_agente.php,
	  godmode/agentes/module_manager.php,
	  include/functions_modules.php: Implemented a real not-init status.
	  Small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7325 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 14:53:11 +00:00
Ramon Novoa 978bfd2033 2012-12-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm,
	  util/pandora_db.pl: Implemented a real not-init status. Small fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 14:42:15 +00:00
zarzuelo f0ee97536a 2012-12-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
	include/functions_events.php: Adapt details view of events
	to metaconsole links



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 11:11:22 +00:00
jsatoh 60290d0db4 2012-12-21 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_module_interval.php: Translated into Japanese.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-21 00:35:04 +00:00
zarzuelo 82e7f50377 2012-12-20 Sergio Martin <sergio.martin@artica.es>
* operation/tree.php
	operation/events/events_list.php
	operation/events/events.php
	godmode/events/event_edit_filter.php
	godmode/events/event_responses.list.php
	godmode/events/custom_events.php
	godmode/events/events.php
	godmode/events/event_filter.php
	godmode/events/event_responses.editor.php: Fix several links
	in events manager for metaconsole (things like pure parameter)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-20 18:00:00 +00:00
zarzuelo e8f3153d11 2012-12-20 Sergio Martin <sergio.martin@artica.es>
* include/ajax/events.php
	include/functions_events.php
	include/javascript/pandora_events.js: Adapt responses
	to metaconsole connection (retrieving of event address macro)
	and set format to tags in event view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7317 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-20 15:33:23 +00:00
zarzuelo 54dd8cbc00 2012-12-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php: Added missed translation of 
	All group name

	* operation/events/events_list.php: Added compatibility on groups
	filter in events for metaconsole.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-20 12:24:21 +00:00
Ramon Novoa 07a2889d7a 2012-12-19 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor_common.php,
	  include/help/en/help_module_interval.php,
	  include/help/es/help_module_interval.php,
	  include/help/ja/help_module_interval.php: Added help files for
	  module interval.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-20 10:25:09 +00:00
zarzuelo 4e4a8b9e95 2012-12-20 Sergio Martin <sergio.martin@artica.es>
* include/ajax/agent.php
	include/functions_ui.php
	include/constants.php
	operation/events/events_list.php: Modify the event list
	filter to adapt the agent search to metaconsole.
	Fix little bug of autocomplete control too



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7314 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-20 10:09:52 +00:00
Ramon Novoa f6da945f45 2012-12-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Return async modules to normal after
	  twice the module interval has elapsed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-19 17:51:15 +00:00
juanmanuelr afc86a7bca 2012-12-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_users.php: Fixed warning when chat log file
	doesn't exists.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-19 17:33:40 +00:00
zarzuelo e8628e0e2f 2012-12-19 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Added new function to update 
	replicated events (enterprise feature) and fix some little
	bugs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-19 17:02:25 +00:00
juanmanuelr dded9176a5 2012-12-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extensions/module_groups.php: Fixed view, colors in cells were
	bad printed and alert popup also had sql errors.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-19 14:04:47 +00:00
hkosaka 9a6378f694 2012-12-19 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added function
	'api_get_pandora_servers'.

        * include/functions_servers.php: Fixed a type.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-19 08:48:12 +00:00
juanmanuelr 2497dce981 2012-12-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php
	include/functions_reports.php
	extensions/resource_registration.php
	extensions/resource_exportation.php
	operation/reporting/reporting_xml.php
	godmode/reporting/reporting_builder.list_items.php
	godmode/reporting/reporting_builder.php
	godmode/reporting/reporting_builder.item_editor.php: Fixed report
	templates.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-18 15:47:11 +00:00
mdtrooper 276dddde48 2012-12-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: fixed check if it set the id_user
	in the session.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-18 14:43:33 +00:00
zarzuelo 3109f775a4 2012-12-18 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_list.php
	godmode/events/custom_events.php: Fixed
	a couple of bugs of style and event viewer
	normal



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-18 12:16:26 +00:00
juanmanuelr 8b36e399cf 2012-12-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Resize URL item report to make it
	taller.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-18 12:01:54 +00:00
zarzuelo 57ab72b1a7 2012-12-18 Sergio Martin <sergio.martin@artica.es>
* include/ajax/events.php
	include/functions_graph.php
	include/functions_events.php
	include/javascript/pandora_events.js
	operation/events/events_list.php
	operation/events/events.php
	godmode/events/custom_events.php
	godmode/events/events.php: Add compatibility 
	with metaconsole in the event viewer



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7299 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-12-18 11:54:22 +00:00