Commit Graph

815 Commits

Author SHA1 Message Date
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 2014-02-21 13:57:18 +01:00
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
	config/config.sample.php
2014-02-21 09:51:51 +01:00
Lukas Reschke f7fa8662e2 Remove `session_id_regenerate` from here
Jenkins somewhat complains that there are already sent headers.
2014-02-21 08:12:45 +01:00
Lukas Reschke 69325c5eeb Move session_regenerate_id to `login()` 2014-02-21 08:11:07 +01:00
Lukas Reschke f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
Thomas Müller b35cd54e87 Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer
Conflicts:
	lib/private/files.php
2014-02-20 16:36:37 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
Björn Schießle 4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator
Add missing slash in URLGenerator::getAbsoluteURL().
2014-02-20 14:57:03 +01:00
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons
Fix filetype icons
2014-02-20 14:53:41 +01:00
Lukas Reschke 0241ddc759 Merge pull request #6519 from nhirokinet/master
Security Update: session fixation
2014-02-20 14:28:26 +01:00
Thomas Müller fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Thomas Müller 31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991 742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup
fix master - #7274 brokes it
2014-02-20 13:40:12 +01:00
Thomas Müller 8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00
Thomas Müller 7242d00aa6 enable static delivery of css files 2014-02-20 13:27:46 +01:00
Thomas Müller ac8e6b15b6 kill references to core.js and core.css 2014-02-20 13:23:24 +01:00
Thomas Müller bf22ed7bdb kill old minimizer code 2014-02-20 13:10:56 +01:00
Björn Schießle 16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Jan-Christoph Borchardt 3e235b2699 merge master 2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt a6fb6abbe0 fix filetype icons for gzip, tex, perl, csv, sh 2014-02-20 10:45:11 +01:00
Morris Jobke b76a3993d4 fix master - #7274 brokes it 2014-02-20 09:47:59 +01:00
Bjoern Schiessle 2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Jan-Christoph Borchardt cac4652c10 coding style: spaces around => 2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt 937a25593b fix lots of file type icons for archives, js, flash, ics, fonts, code, ... 2014-02-19 16:27:38 +01:00
Lukas Reschke 2d5b3899a6 Hardening: Remove dangerous characters + Subdirectory Check
If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.
2014-02-19 15:38:00 +01:00
Vincent Petry 952584e9c7 Merge pull request #7195 from owncloud/files-selectall
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
Morris Jobke bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
Morris Jobke f944707a15 fix wrong removes 2014-02-19 11:50:17 +01:00
icewind1991 2d5ab1a5c4 Merge pull request #7260 from owncloud/watcher-policy
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
Robin Appelman 1331de554c Reuse the folder id in View->getFolderContents 2014-02-19 10:46:02 +01:00
Vincent Petry e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller 1e321406ee Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
icewind1991 3cc7228c7c Merge pull request #7253 from owncloud/preferences-caching
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
Thomas Müller 8991e4505a Merge pull request #6796 from owncloud/statementwrapper-bindparam
Add bindParam to the database statement wrapper
2014-02-18 18:13:57 +01:00
Thomas Müller 1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Vincent Petry bd71a1b7b6 Added file name check in webdav connector
- added file name check for the put, rename and setNames() methods which
  throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
  unit tests
2014-02-18 17:54:32 +01:00
Vincent Petry 797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
2014-02-18 17:54:32 +01:00
Tom Needham a573fe7d76 Merge pull request #6650 from owncloud/migration_unit_tests
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
Lukas Reschke 3b1083f46e Merge pull request #7176 from owncloud/style
Some style fixes
2014-02-18 17:30:26 +01:00
tomneedham 0beaeed713 Remove unused variables 2014-02-18 16:28:04 +00:00
Robin Appelman 2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00
Robin Appelman d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
Robin Appelman ac2e3ab373 remove some unneeded isset's 2014-02-18 14:27:55 +01:00
Robin Appelman 2e97a4cd32 Fix some phpdoc 2014-02-18 14:26:27 +01:00
tomneedham df38d4ef1a Return 101 if user doesnt exist 2014-02-18 10:36:18 +00:00
Robin Appelman b6f44e9a1d Add caching to OC\Preferences 2014-02-18 11:21:39 +01:00
tomneedham 2f1a24eee7 Add displayname for admins 2014-02-18 09:50:46 +00:00
Thomas Müller 5d3fc03750 Merge pull request #7239 from owncloud/cbr-filetype-icon
add cbr/cbz file type icon, fix #6953
2014-02-18 10:23:54 +01:00
Jan-Christoph Borchardt c2adf033f2 use file icon as fallback instead of application icon, fix #7237 2014-02-17 20:58:33 +01:00
Jan-Christoph Borchardt 0f434038a7 add cbr/cbz file type icon, fix #6953 2014-02-17 20:48:32 +01:00
tomneedham a4b6d66703 Merge branch 'master' into migration_unit_tests 2014-02-17 11:03:57 +00:00
Thomas Müller 750ffa8231 Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Morris Jobke df282d9ef8 Merge pull request #7207 from owncloud/fileinfo-serializable
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
Thomas Müller 41f0ad2d13 Merge pull request #7204 from owncloud/groupexists-duplicate
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
Robin Appelman 09502fcb36 remove the JsonSerializable interface from \OC\Files\FileInfo 2014-02-14 19:26:06 +01:00
icewind1991 2a7509ee50 Merge pull request #6748 from owncloud/fileinfo
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Robin Appelman b35f679483 Fix test cases for group manager 2014-02-14 15:07:08 +01:00
Robin Appelman 0ba0596341 remove duplicate call to groupExists 2014-02-14 14:25:45 +01:00
Georg Ehrke f62f1658ce suppress error msg caused by php bug 2014-02-14 11:23:39 +01:00
Vincent Petry d5397d813c Do not send file list for select all on Download/delete
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
  with root
- Delete will send "allfiles" to the server that will find the file
  list or the passed directory by itself
2014-02-13 20:28:52 +01:00
Robin Appelman 181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Thomas Müller 4b84e3a7e8 Merge pull request #4624 from owncloud/convert-oc_appconfig
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
kondou fc01a13811 Fix imagerotate and move loadFromBase64() one up.
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5

loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
2014-02-12 22:35:49 +01:00
Bart Visscher 2c6411b897 $default of OC_Config::[gs]etValue can have more then string as type 2014-02-12 17:38:32 +01:00
icewind1991 7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman d6576c640c Add unit tests for JobList 2014-02-12 13:52:13 +01:00
Robin Appelman 62288971ca Additional phpdoc 2014-02-12 13:32:16 +01:00
Robin Appelman 60bd9d512d Merge branch 'master' into backgroundjob-public 2014-02-12 13:21:47 +01:00
Bart Visscher 1fb5f96c37 Style fixes 2014-02-12 09:09:51 +01:00
Vincent Petry c442a03d3a Merge pull request #7075 from owncloud/quota-storagexsendfile
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
Robin Appelman 50cc6a85e5 Add explicit sorting 2014-02-11 14:26:40 +01:00
Robin Appelman a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman a7c50514ac Merge branch 'master' into convert-oc_appconfig 2014-02-11 13:26:54 +01:00
Arthur Schiwon af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon 32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon 20bfbb0fd9 wrong tld 2014-02-11 10:49:54 +01:00
Arthur Schiwon 82716ced48 sort following entries in alphabetical order 2014-02-11 10:49:41 +01:00
Arthur Schiwon 41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00
Bart Visscher 082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Vincent Petry bea80ffe20 Merge pull request #6881 from owncloud/remove-user-storage-entry
Also remove the user's home storage from the storage table when deleting a user
2014-02-10 15:04:05 +01:00
Tom Needham 84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs
[ocs API] getData() always needs to return an array
2014-02-10 13:43:16 +00:00
Robin Appelman e6df86f4cb Merge branch 'master' into quota-space-root 2014-02-10 14:03:06 +01:00
Robin Appelman 753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Robin Appelman 5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Thomas Müller 45d07906b8 Merge pull request #7131 from owncloud/issue/6269
Change MySQL to MariaDB/MySQL in the frontend
2014-02-10 11:09:03 +01:00
Thomas Müller 8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed
properly check if pdf and svg modules are installed
2014-02-10 10:28:32 +01:00
Thomas Müller 8de9758fee Merge pull request #7071 from jcfischer/master
close statement in MimeType detection is executed [#7069]
2014-02-10 10:27:21 +01:00
Andreas Fischer bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
2014-02-08 14:21:19 +01:00
Joas Schilling b330d07b51 Fix more documentation failes
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman 8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +01:00
Thomas Tanghus 2ff0d3a255 Test if $url is already prefixed by '/' 2014-02-07 17:39:19 +01:00
Joas Schilling dbec143f09 Change MySQL to MySQL/MariaDB in the frontend
Fix issue #6269
2014-02-07 17:03:43 +01:00
Bjoern Schiessle dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Robin Appelman cd3ef0bb9d Add caching to appconfig 2014-02-07 14:03:39 +01:00
Thomas Müller f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings
change order of issubdirectory() calls to avoid error messages for non-apps
2014-02-07 13:47:33 +01:00
Robin Appelman b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Vincent Petry 788c8540aa Added isLocal() method to storage, used for xsendfile
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
Vincent Petry be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support
New user agent added for the Freebox.
2014-02-06 18:12:32 +01:00
Vincent Petry 5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Robin Appelman 1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
Jens-Christian Fischer 11f46e121c close statement in MimeType detection is executed [#7069]
close statement was never executed due to it being after a return
statement.
2014-02-04 17:03:52 +01:00
Vincent Petry bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix
Allow getting info or renaming part files through WebDAV
2014-02-04 07:48:37 -08:00
Robin Appelman f830ad0e47 Don't create new thumbnails on the write hook 2014-02-04 16:28:41 +01:00
Morris Jobke 3c80071807 Merge pull request #4795 from owncloud/setup
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Georg Ehrke d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Bjoern Schiessle 36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Björn Schießle c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log
wrap stat() call in a try/catch block
2014-02-03 07:58:44 -08:00
Robin Appelman 0ae4022fb4 Also clean up the filecache table when deleting a storage entry 2014-02-03 16:36:21 +01:00
Robin Appelman 8d6a3a00b4 Revert "Use Cache->clear to cleanup the filecache for removed users"
This reverts commit 5a5b6f187e.
2014-02-03 16:29:04 +01:00
Bjoern Schiessle cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle 44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bart Visscher f1c60c7f8b Remove unused functions from OC_Helper
init_var and init_radio  where only used in the installation template
2014-01-31 17:33:15 +01:00
Bart Visscher bca725dc32 Merge branch 'master' into setup
Conflicts:
	core/setup.php
2014-01-31 16:43:12 +01:00
Robin Appelman 0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Tigran Mkrtchyan 8cc9727520 mount: make location of mount.json configurable
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
Robin Appelman 4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons
Add/fix Microsoft Office file icons.
2014-01-29 07:31:25 -08:00
Bjoern Schiessle 229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Martial Saunois 0f1c587e6b The regexp of the Freebox user agent is now more strict.
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman 20c2aaab00 Actually rename the variable 2014-01-27 16:26:54 +01:00
Robin Appelman c8207312c7 Fix phpdoc 2014-01-27 16:00:10 +01:00
Robin Appelman 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Robin Appelman a521949baf Allow passing a root folder to get the used space from in the quota wrapper 2014-01-27 15:41:56 +01:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Martial Saunois c2ed8d5aa1 New user agent added for the Freebox.
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
2014-01-26 18:46:09 +01:00
Thomas Tanghus 5f610a1cbc Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 2014-01-24 16:40:32 +01:00
Robin Appelman 1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Robin Appelman fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Otto Sabart 2f8ebd03b0 Add check for apc.enabled option
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
2014-01-24 15:52:28 +01:00
Vincent Petry 5ad28f4d1f Allow getting info or renaming part files through WebDAV
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.

This fix leaves the file cache untouched but gives direct access to part
file info when requested.

This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.

Fixes #6068
2014-01-23 18:42:56 +01:00
Andreas Fischer 96f194c0f6 Add icons for mdb and accdb files. 2014-01-23 03:06:14 +01:00
Andreas Fischer 47ea7704ca Fix icons for xml,ppt,dot,dotx files. 2014-01-23 02:46:05 +01:00
Andreas Fischer 689516ebd7 Remove duplicate mimetypes while keeping previous behaviour. 2014-01-23 02:23:20 +01:00
Andreas Fischer 6241655df4 Bring mimetype list into alphabetical order. 2014-01-23 02:15:42 +01:00
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Robin Appelman 5a5b6f187e Use Cache->clear to cleanup the filecache for removed users 2014-01-22 13:00:45 +01:00
Nicolai Ehemann 99ad4e8000 switched zip file creation to ZipStreamer to create zip files directly in memory 2014-01-22 12:49:52 +01:00