wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26494 commits 157 branches 562 tags 714 MiB
Commit graph

9857 commits

Author SHA1 Message Date
Thomas Müller
cd1bfd7eb6 Fix authors 2015-08-03 21:02:41 +02:00
Thomas Müller
3358db320b Reduce duplicate code 2015-08-03 18:06:07 +02:00
Thomas Müller
bacf1603ff Adding ocs/v2.php with status code mapper 2015-08-03 16:05:50 +02:00
Robin Appelman
9729e67e3d more phpdoc 2015-08-03 16:02:24 +02:00
Robin Appelman
cd205249e4 more phpdoc 2015-08-03 15:46:23 +02:00
Robin Appelman
132a564a21 rename path field to key 2015-08-03 15:46:19 +02:00
Morris Jobke
767ca44988 Merge pull request #17820 from owncloud/dav-exception-log-class 
also log the class for dav exceptions
 2015-08-03 15:14:21 +02:00
Robin Appelman
c39ded21d2 initialize unused (for now) ttl field to 0 2015-08-03 14:13:36 +02:00
Robin Appelman
96a9d171b3 Fix db schema 2015-08-03 14:13:36 +02:00
Robin Appelman
86acd535c2 use the database backend for locking if no memcache is configured for it 2015-08-03 14:13:36 +02:00
Robin Appelman
4ea7cbb0f5 Add database backend for high level locking 2015-08-03 14:13:35 +02:00
Robin Appelman
a8552a1b24 split off keeping track of acquire locks 2015-08-03 14:12:56 +02:00
Robin Appelman
2a90cbe603 go trough the updater when uploading over webdav 2015-08-03 13:42:36 +02:00
Andreas Fischer
3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Bjoern Schiessle
51a67a54e0 always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache 2015-07-31 17:14:32 +02:00
Jenkins for ownCloud
de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Robin McCorkell
182bc17aeb Sanitize class names before registerService/query 
Leading backslashes are removed, so a `registerService('\\OC\\Foo')`
can still be resolved with `query('OC\\Foo')`.
 2015-07-30 21:02:16 +01:00
Thomas Müller
22fd04eb41 Merge pull request #17981 from owncloud/correct-regex 
Correct regular expressions
 2015-07-30 16:07:46 +02:00
Morris Jobke
80810ae10f Merge pull request #17963 from owncloud/remove-derecated-mysql-functions 
Moving mysql setup code over to Doctrine
 2015-07-30 15:21:54 +02:00
Lukas Reschke
e95bc68ac7 Check for PDO instead of removed function for PHP 7 compatibility 2015-07-30 12:32:22 +02:00
Lukas Reschke
ad4c731c4c Correct regular expressions 
Previously the regex was only matching on single characters. Meaning that file names such as "👍.txt" where possible while "👍" alone never was. This check apparently never worked as expected.
 2015-07-30 11:22:14 +02:00
Jenkins for ownCloud
a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Thomas Müller
c3cac887f5 - more injection 
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
 2015-07-30 00:04:30 +02:00
Thomas Müller
114f128fc3 Moving mysql setup code over to Doctrine 2015-07-29 23:12:59 +02:00
Thomas Müller
5ed38a75d6 Remove remainings of mssql 2015-07-29 18:19:31 +02:00
Bjoern Schiessle
8fb89056bd make knowledge base url configurable 2015-07-29 18:07:04 +02:00
Robin McCorkell
3ef680d966 Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydefault 
Disable filesystem_check_changes by default
 2015-07-29 15:34:02 +01:00
Vincent Petry
7c9405a921 Disable filesystem_check_changes by default 
This will prevent detecting remote changes done in the data folder /
root storage by default. In the rare cases where the data folder is
shared with other apps/users outside ownCloud and change detection is
needed, the admin will have to set the option explicitly from now on.

Note that this doesn't affect external storages which have their own
setting in the mount options.
 2015-07-29 12:01:12 +02:00
Bjoern Schiessle
fb4c99fe06 make sure that we emit the hooks if a file gets moved from a subfolder to the root folder with the nodes API 2015-07-29 11:02:38 +02:00
Jenkins for ownCloud
e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04:00
Morris Jobke
c34e63bb1f Merge pull request #15543 from rullzer/mimetypedetector 
Mimetypedetector
 2015-07-28 13:35:26 +02:00
Roeland Douma
73169b0edb Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file 
Remote shares should be uique
 2015-07-28 13:06:25 +02:00
Jenkins for ownCloud
c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Vincent Petry
6ada1e3276 Merge pull request #17902 from owncloud/fix_17898 
get header size before we open the file to avoid locking exception
 2015-07-27 16:58:32 +02:00
Thomas Müller
68f14a943a Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption 
Only set is encrypted when encryption is enabled
 2015-07-27 16:06:39 +02:00
Roeland Jago Douma
d276aebf40 Pass config dir as parameter to detection class 
In order to properly test the mimetype function:

* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
 2015-07-27 14:59:49 +02:00
Roeland Jago Douma
88fb389eab Proper deprecate methods 2015-07-27 14:59:49 +02:00
Roeland Jago Douma
9cdd637050 Loading of mapping/aliases is done in class 2015-07-27 14:59:49 +02:00
Roeland Jago Douma
141a0f0f47 Move mimetypedetection to files/type/detection 2015-07-27 14:59:45 +02:00
Roeland Jago Douma
6db6689740 Added mimetype detector 
* Copied unit tests from old functions
 2015-07-27 14:58:45 +02:00
Bjoern Schiessle
0736b45d92 get header size before we open the file to avoid locking exception 2015-07-27 14:29:07 +02:00
Thomas Müller
c030ae9dec Merge pull request #17879 from owncloud/scan-check-path 
check if the user is trying to scan a valid path
 2015-07-27 13:39:53 +02:00
Robin Appelman
f74525c349 check if the user is trying to scan a valid path 2015-07-27 11:21:48 +02:00
Morris Jobke
c9e22f70c8 Add PHPDoc for classes and interfaces 2015-07-27 10:49:26 +02:00
Bernhard Posselt
d8673dabe3 add test for factories 
use ref for factory test

use a factory for registerAlias

Ensure we construct SimpleContainer

Use single instance of DIContainer in routing tests
 2015-07-25 01:59:30 +02:00
Thomas Müller
11244736ae Merge pull request #17838 from owncloud/sharing-password-policy-master 
Use a hook to integrate sharing password verification
 2015-07-24 16:47:18 +02:00
Robin Appelman
91fbee8988 also log the class for dav exceptions 2015-07-24 13:30:52 +02:00
Thomas Müller
1f8ee61006 Merge pull request #17755 from owncloud/alias-container-alive 
Add registerAlias method to shortcut interface registration #17714
 2015-07-24 13:11:32 +02:00
Morris Jobke
5265a44260 Remove commented code 2015-07-24 00:47:41 +02:00
Bernhard Posselt
582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip 
Replace jQuery tipsy with bootstrap tooltip
 2015-07-23 19:25:09 +02:00
Thomas Müller
632e39a750 Fix PHPDoc on setPassword 2015-07-23 16:11:06 +02:00
Joas Schilling
9cee8ff9f8 Only set is encrypted when encryption is enabled 2015-07-23 15:18:59 +02:00
Thomas Müller
ac08685234 Use a hook to integrate sharing password verification 2015-07-23 14:44:48 +02:00
Joas Schilling
02323eca01 Throw a InvalidArgumentException when a consumer/extension is invalid 2015-07-23 11:00:29 +02:00
Joas Schilling
8d47260144 Allow types to be method specific 2015-07-22 15:10:34 +02:00
Joas Schilling
20cd0ae55b Add a log message when the Doctrine Query Builder is retrieved 2015-07-21 15:53:28 +02:00
Joas Schilling
f9071ed5b7 Comment out LIMIT 0 case because of the mixed results 2015-07-21 15:25:48 +02:00
Joas Schilling
c9564503c2 Fix tests for setFirstResult and setMaxResults on oracle 2015-07-21 15:25:48 +02:00
Joas Schilling
f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling
516f7e8299 Add unit tests and automatic quoting 2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Joas Schilling
1bfb944d51 Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers 2015-07-21 15:25:47 +02:00
Morris Jobke
2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group 
[sharing] fix addToGroup hook
 2015-07-21 13:30:41 +02:00
Roeland Douma
40170f35f6 Merge pull request #17766 from owncloud/escape-ampersand 
Escape ampersand in logout URL
 2015-07-21 09:32:16 +02:00
Jenkins for ownCloud
24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Morris Jobke
5a5c59639b Escape ampersand in logout URL 
* fixes #17757
 2015-07-21 00:26:30 +02:00
Bernhard Posselt
d20e2002a6 Merge pull request #17743 from owncloud/return-proper-statuscodes 
Return proper status code in case of a CORS exception
 2015-07-20 18:03:25 +02:00
Robin McCorkell
75a5e6e12b Fix mounting wrapped storages resulting in many-layered wrapping 
This usually doesn't cause issues, but in unit tests sometimes a wrapped
storage is passed to Filesystem::mount() and gets rewrapped, hitting the
XDebug function nesting level limit when used.
 2015-07-20 16:27:26 +01:00
Robin McCorkell
df19cabb44 Store storage availability in database 
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.

Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
 2015-07-20 16:27:26 +01:00
Robin McCorkell
aac84f732d Unit test OC_Files::setUploadLimit() 
There was also a bug with checking the upper limit on the passed upload
size. PHP does funny things with integer vs float comparisons, so our
check didn't work. Now the check is much simpler, and ensures the value
is sane.
 2015-07-20 15:03:09 +01:00
Robin McCorkell
d3bcafe618 Update .user.ini when setting upload size limit 2015-07-20 12:52:43 +01:00
Lukas Reschke
7dda86f371 Return proper status code in case of a CORS exception 
When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus.

Fixes https://github.com/owncloud/core/issues/17742
 2015-07-20 12:54:22 +02:00
Joas Schilling
0dd1a785fe Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-classes 
Allow app check code for deprecated classes
 2015-07-20 08:39:53 +02:00
Jenkins for ownCloud
83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Lukas Reschke
1e4496c1cb Merge pull request #17698 from owncloud/allow-update-of-disabled-apps 
Allow upgrade of not enabled apps
 2015-07-19 12:14:13 +02:00
Bernhard Posselt
a4e3939204 add registerAlias method to shorcut interface registration 
remove unused import

add since tag

fix typo
 2015-07-18 13:43:54 +02:00
Björn Schießle
f363fc2d4a Merge pull request #17540 from owncloud/enc_detect_legacy_files2 
make sure that we always detect legacy files correctly
 2015-07-17 21:42:32 +02:00
Thomas Müller
2e1cc2d825 Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-master 
Fixing 'Undefined index: REMOTE_ADDR'
 2015-07-17 14:27:33 +02:00
Bjoern Schiessle
16d8014cdd set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file 2015-07-17 13:30:08 +02:00
Bjoern Schiessle
a2e2005e67 make sure that we always detect legacy files correctly 2015-07-17 13:30:08 +02:00
Morris Jobke
f7a78cf650 Merge pull request #17663 from owncloud/occ-memcache 
Missing memcache should not cause occ hard-fail
 2015-07-17 13:15:47 +02:00
Joas Schilling
3566dcf246 PR #17046 deprecated OCP\Util::mb_(sub)str_replace() 2015-07-17 12:34:56 +02:00
Joas Schilling
8a64abf4e4 Only decorate the type when it was matched 2015-07-17 12:34:56 +02:00
Joas Schilling
a0c6f2e5e0 Use the decorator pattern 2015-07-17 12:34:56 +02:00
Joas Schilling
bba87a2a3b Restructor the code into different classes instead of extending 2015-07-17 12:34:56 +02:00
Joas Schilling
eb1c437941 Check for methods as good as possible 2015-07-17 12:34:56 +02:00
Joas Schilling
2783a78070 Allow checking for functions 2015-07-17 12:34:56 +02:00
Joas Schilling
f228a3dc28 Add support for deprecated constants 2015-07-17 12:34:56 +02:00
Joas Schilling
483c886291 Add deprecation version to the list 2015-07-17 12:34:56 +02:00
Joas Schilling
d2fc1b2302 Correctly handle use statements 2015-07-17 12:34:56 +02:00
Joas Schilling
4e95031ec4 Allow app:check-code to check for deprecated methods 2015-07-17 12:34:55 +02:00
Morris Jobke
3fae984b56 Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions 
Throw lock exceptions if remote share returned 423 status code
 2015-07-17 11:34:34 +02:00
Jenkins for ownCloud
8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Thomas Müller
bd71540c8a Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 2015-07-16 16:40:57 +02:00
blizzz
bfb90d10ed Merge pull request #17046 from nicolas-grekas/fix-16654 
Do not use OC*::mb_*_replace(), they are useless
 2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Robin McCorkell
8efa23c895 Fix memcache factory unit tests 2015-07-16 03:53:18 +01:00
Robin McCorkell
e556d97b64 Fix memcache factory creation when not installed 
Memcache factory expects a class name, not an instantiated object
 2015-07-15 22:55:30 +01:00
Robin McCorkell
7830434d78 Missing memcache should not cause occ hard-fail 
Warning is now printed to logs, but occ and cron will still work.
 2015-07-15 22:53:14 +01:00
Robin Appelman
da951ba059 Use the new IteratorDirectory instead of the fakedir wrapper 2015-07-15 13:57:53 +02:00
Roeland Jago Douma
fea71a81fd Cannot share the same file multiple times with remote user 
Fix for #17183
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
 2015-07-15 12:42:40 +02:00
Morris Jobke
c601fb8181 Merge pull request #17620 from owncloud/s2s-hasupdated-catch405 
Throw StorageNotAvailable if propfind on root failed
 2015-07-14 08:56:53 +02:00
Jenkins for ownCloud
2d5ddb02fa [tx-robot] updated from transifex 2015-07-14 01:54:45 -04:00
Vincent Petry
f62d94c4ff Throw StorageNotAvailable if propfind on root failed 
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
 2015-07-13 18:28:53 +02:00
Vincent Petry
b3b080e1c0 Strip public webdav info about sharing and mount points 
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
 2015-07-13 14:20:35 +02:00
Morris Jobke
1006ec56ce Merge pull request #17481 from rullzer/mimetype-list 
Move mimetypes.list.php to config/mimetypemapping.dist.json
 2015-07-13 08:31:18 +02:00
Jenkins for ownCloud
7cf6badad5 [tx-robot] updated from transifex 2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Roeland Jago Douma
8cac236135 Move to OC::$configDif 2015-07-10 15:15:50 +02:00
Roeland Jago Douma
032ffc969e Move mimetypealiases.json to mimetypealiases.dist.json 2015-07-10 10:17:49 +02:00
Jenkins for ownCloud
176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Morris Jobke
bceb38ce82 Merge pull request #17517 from RealRancor/fix_failed_login_syntax 
Fixed "Remote IP:" syntax on failed logins
 2015-07-10 02:34:09 +02:00
Morris Jobke
c86e742e67 Merge pull request #15586 from Egari/addThemeSupportToMimeIcon 
Add theme support to mimetypeIcon through imagePath integration
 2015-07-09 23:02:46 +02:00
Morris Jobke
d52e197b0d Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder 
Add getUserFolder to IRootFolder
 2015-07-09 14:29:47 +02:00
Thomas Müller
d3b58d147f Allow upgrade of not enabled apps 2015-07-09 12:37:57 +02:00
RealRancor
e62c375749 Fixed "Remote IP:" syntax on failed logins 2015-07-09 10:04:51 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
tbartenstein
c48e00294c Update fileinfo.php 
Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712)
 2015-07-08 18:48:11 +02:00
Morris Jobke
19f34bafa5 Merge pull request #17472 from RealRancor/add_is_dir 
Add is_dir check to getAllApps() function
 2015-07-08 18:30:45 +02:00
Roeland Jago Douma
895d29adf1 Move mimetypemapping.json to mimetypemapping.dist.json 
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
 2015-07-08 17:16:12 +02:00
Roeland Jago Douma
35fba1ef9f Move mimetypes.list.php to config/mimetypemapping.json 
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.

Fixes: #15384
 2015-07-08 13:18:58 +02:00
Morris Jobke
0fe81d2f21 Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions 
Fix the path for users which have an exception for a group share
 2015-07-08 10:33:42 +02:00
RealRancor
1300204586 Add is_dir check to getAllApps() function 2015-07-08 10:25:39 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
stolter
1fc188fd29 Add theme support to mimetypeIcon through imagePath integration 2015-07-07 14:38:14 +02:00
Joas Schilling
6fb3a8d5f5 Add missing tunnel on new class 2015-07-07 11:18:24 +02:00
Joas Schilling
40eaf71a33 Make sure the owner always has the right path 2015-07-07 11:08:21 +02:00
Morris Jobke
87e10a7fb7 Merge pull request #17399 from rullzer/mimetype-php 
PHP mimetype stuff should also use config/mimetypealiases.json
 2015-07-07 11:05:50 +02:00
Roeland Jago Douma
d685327d5a Make php also use config/mimetypealiases.json 2015-07-07 08:56:15 +02:00
Jenkins for ownCloud
ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04:00
Roeland Douma
b4f782b568 Merge pull request #16724 from owncloud/mimetype-js 
Javascript to fetch mimetype icons
 2015-07-06 20:59:56 +02:00
Bjoern Schiessle
058d910f5e intproduce pre_addToGroup hook. we need to calculate the possible unique 
targets before the user was added to the group otherwise we will always detect
a name collision
 2015-07-06 17:24:05 +02:00
Thomas Müller
9120942bcf Merge pull request #16924 from owncloud/copy-recursive-polyfill 
add recursive copy polyfill for storage backends
 2015-07-06 17:05:36 +02:00
Roeland Jago Douma
c8145cdbd6 Javascript mimetype icon resolver 
This makes it possible to retrieve the icon for mimetypes in javascript.
It makes no additional queries to the server to retrieve the mimetype.

* config/mimetypealiases.json added
* mimetype.js: this is where the logic resides to convert from mimetype
  to icon url
* mimetypelist.js: generated file with a list of mimetype mapping (aliases)
  and the list of icon files
* ./occ maintenance:mimetypesjs : new command for occ to gernerate
  mimetypes.js
* unit tests updated and still work
* javascript tests added
* theming support
* folder of the theme is now present in javascript (OC.theme.folder)
 2015-07-06 16:32:10 +02:00
Vincent Petry
073e654692 Merge pull request #17304 from owncloud/fix-17265 
Check if response could get generated
 2015-07-06 12:29:07 +02:00
Jenkins for ownCloud
5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud
55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Jenkins for ownCloud
468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Thomas Müller
403deb2a33 Fixing unit test execution 2015-07-03 18:00:16 +02:00
Thomas Müller
1385b1ec48 Remove OC_Appconfig 2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Thomas Müller
68fd74963e Remove legacy search classes 2015-07-03 17:56:14 +02:00
Vincent Petry
3df27a01be Merge pull request #17379 from owncloud/kill-file-mapper 
Remove file mapper - was only use in Windows and never worked properly
 2015-07-03 17:53:47 +02:00
Thomas Müller
7b9daf84ee Merge pull request #16923 from owncloud/flysystem-base 
Flysystem base adapter
 2015-07-03 17:48:10 +02:00
Vincent Petry
cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent 
Move away from private static function OC_Util::getUrlContent
 2015-07-03 17:47:46 +02:00
Robin Appelman
de4e4cb6ea also dont download existing on fopen when using w+ and wb+ 2015-07-03 15:53:02 +02:00
Robin Appelman
6cc65b53ab add phpdoc 2015-07-03 15:53:02 +02:00
Robin Appelman
232872e401 add flysystem adapater 2015-07-03 15:53:02 +02:00
Thomas Müller
f55aa856ad Remove file mapper - was only use in Windows and never worked properly 2015-07-03 15:41:29 +02:00
Morris Jobke
838ddc72c1 Merge pull request #17348 from owncloud/fix-lower-than 
Correct lower than wording
 2015-07-03 14:42:08 +02:00