Commit Graph

96 Commits

Author SHA1 Message Date
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
Jose Gonzalez 9f120280a2 Change token for hash generation 2021-06-08 14:21:33 +02:00
Daniel Barbero Martin 3a947d31bd Wip command center, collections merge 2021-06-07 17:58:36 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Jose Gonzalez 7895a82268 Fixed issue with types 2021-06-02 16:06:00 +02:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00
José González 57eeb9a1db Fix vulnerability with directories created in upper levels 2021-05-27 16:19:51 +02:00
marcos 0195a80b78 fixed visual error 2021-03-17 14:41:36 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Luis 28b8092669 Added infobox for empty folder on collections 2021-03-02 12:21:13 +00:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
alejandro-campos 59e2930bec fixed global declaration in meta 2020-12-01 13:15:48 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Luis Calvo 7a35e8550c Fixed collections symlinks 2020-05-19 18:53:09 +02:00
Daniel Rodriguez ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
Jose Gonzalez f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Daniel Maya c79a4b2c01 fixed file vulnerability 2019-12-31 11:24:54 +01:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Luis Calvo a5e80f5070 Fixed filemanager uploading on meta
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
2019-04-24 11:12:26 +02:00
Tatiana Llorente 2a37224653 New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Daniel Rodriguez cfa2c08b16 Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop'
fix bug in functions_filemanager

See merge request artica/pandorafms!2243

Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
2019-03-11 12:37:23 +01:00
alejandro-campos d760c7d701 fix bug in functions_filemanager
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
2019-03-06 17:07:37 +01:00
Daniel Maya cefaccb651 Fixed synchronize collections in node
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
daniel df88582982 fixed error filemanager
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
danielmaya 04ebb6b2c5 Added delete function in the api 2018-11-19 11:28:35 +01:00
danielmaya 2a0d2e6c46 collection management from metaconsole 2018-11-13 08:33:47 +01:00
Arturo Gonzalez 64b926e482 Added qw perms 2017-11-28 13:36:33 +01:00
Alejandro Gallardo Escobar 64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04:58 +01:00
Arturo Gonzalez 18cfb9d6e2 Fixed edit file in collections. Ticket# 4126 2016-10-21 12:21:44 +02:00
m-lopez-f 9db6a2d244 Fixed problems with edit colecctions/plugins in pandora console. 2016-10-20 13:41:37 +02:00
Daniel Maya 24d466e185 Changes in the types of format accepted.Ticket #4032. 2016-09-16 09:23:52 +02:00
Daniel Maya a3cd8a7c86 FFixed editing plugins. Ticket #4032. 2016-09-15 15:47:10 +02:00
Hirofumi Kosaka d38d14cfe8 Fixed bug that url-unsafe chars could be generated for download URL.
(e.g. multi-byte chars included in target file name)
2016-07-15 16:33:16 +09:00
fbsanchez 744c07237f Fixed: File upload (mib upload)i
> safe_output on field and php warning
2016-07-04 10:51:16 +02:00
fbsanchez 8b99e9757a Fixed: File upload (mib upload)i
> safe_output on field and php warning
2016-07-04 10:48:18 +02:00
Daniel Maya ee4a5f4119 added new types of text. Ticket #3435. 2016-06-16 11:50:20 +02:00
Daniel Maya 36bb76bebc fixed table filemanager. Ticket #3435. 2016-06-14 12:06:38 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 458d9909d4 Now in the function 'filemanager_read_recursive_dir' returns the directories
(cherry picked from commit ae97ad964d)

Conflicts:
	pandora_console/include/functions_filemanager.php
2015-06-09 15:55:59 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper 8efc616d19 Added the feature for the set the working directory of filemanager. Ticket #1228 2014-09-08 14:17:46 +02:00
mdtrooper bbc314b776 Some fixes for the empty text files in the filemanager. 2014-09-08 13:45:52 +02:00
alexhigh 5b95334ad0 2014-04-25 Alejandro Gallardo <alejandro.gallardo@artica.es>
* extensions/system_info.php,
	  godmode/servers/plugin.php,
	  godmode/setup/file_manager.php,
	  include/config_process.php,
	  include/functions_filemanager.php,
	  include/functions_html.php,
	  operation/gis_maps/ajax.php,
	  operation/snmpconsole/snmp_mib_uploader.php: Replaced
	the possible backslashes with slashes in the directories
	path.

	* include/functions_graph.php: Modified the function
	"grafico_modulo_log4x" to adapt the 'set_include_path' to
	Windows.

	* include/get_file.php: Now the file name comes from the
	function "basename".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9814 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-25 11:07:30 +00:00
mdtrooper 2f42ff5fc4 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_filemanager.php: fixed PHP notice when this
	file is included and there is not a upload file action.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 06:41:02 +00:00