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

402 commits

Author SHA1 Message Date
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
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +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
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Joas Schilling
658af627ce External FTP Storage should request hostname instead of URL 
Fix issue #6277
 2014-02-12 18:20:10 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Joas Schilling
828985dc60 Make google drive client secret and dropbox api secret a password field 
Fix issue #5794
 2014-02-07 18:12:01 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01: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
Vincent Petry
bf95532fb6 Removed unused writeBack method 2014-01-23 15:05:05 +01:00
Vincent Petry
421f24868a Now using SFTP stream wrapper from phpseclib 
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
 2014-01-23 12:43:12 +01:00
Tigran Mkrtchyan
a78dc11732 webdav: return SPACE_UNKNOWN if server do not support quota 
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-01-17 11:45:26 +01:00
Vincent Petry
5e04b7f284 Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files 
Fixing Issue #6301 on master branch
 2014-01-13 07:09:01 -08:00
Thomas Müller
a8d20e0919 Merge pull request #5238 from owncloud/externalstorage-owncloudbackend 
Added ownCloud backend for external storage
 2014-01-08 01:49:15 -08:00
Michael Monreal
f52a9e5e42 Silence output of 'which' command used in smbclient detection 2013-12-27 18:10:47 +01:00
Carlos Cerrillo
c06844c374 Fix ``createCertificateBundle` and `getCertificates`` methods 
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
 2013-12-17 10:13:14 +01:00
Carlos Cerrillo
b245e2e3d8 Fixing tab/space coding style 
Only set SSL things when ```$this->secure``` is ```true```
 2013-12-17 09:38:43 +01:00
Carlos Cerrillo
7c264c88fe Fixing Issue #6301 on master branch 
Added private var $certPath to store the user root cert

Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()

Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
 2013-12-15 17:22:52 +01:00
Vincent Petry
3b7905364f Fixed test function for S3 
Fixes #5752
 2013-12-03 12:26:08 +01:00
Vincent Petry
76b1fcbf27 Fixed Amazon S3 ext storage config UI 
Optional parameters are now really optional

Fixes #5861
 2013-12-03 12:26:08 +01:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders 
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
 2013-11-29 13:01:01 +01:00
Vincent Petry
84f3dd15a6 Add trailing slash in FTP root path when missing 
Fixes #6093
 2013-11-28 11:45:26 +01:00
Vincent Petry
30e086fb53 Fixed SFTP storage to overwrite on rename 2013-11-26 16:32:44 +01:00
Vincent Petry
2653d914d9 Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix 
Fixed SMB rename function to overwrite target file
 2013-11-26 06:42:36 -08:00
Morris Jobke
a48fc120d0 Merge pull request #6054 from owncloud/extstorage-dropboxfixes 
Fixed various Dropbox issues + unit tests
 2013-11-26 04:48:54 -08:00
Vincent Petry
e102eec89a Return true when touch succeeds 2013-11-26 12:47:00 +01:00
Vincent Petry
7c81ac3d28 Fixed various Dropbox issues + unit tests 
- fixed touch function to return true on success
- fixed local metadata cache to remove deleted files/directories
- fixed getMetaData() to ignore files reported as deleted by
  Dropbox
- fixed "file not found" case to not log as exception
- fixed "overwrite on rename" case
- fixed unit tests to exclude unsupported cases
- added unit test for touch return value
- unit tests for Dropbox should all run correctly now
 2013-11-26 11:59:36 +01:00
Vincent Petry
d88025bf6b Fixed ext storage touch function to return true on success 
Some ext storage impl didn't return true on success.

Fixes #5943 (Dropbox)
Fixes #6010 (WebDAV)
 2013-11-25 12:44:27 +01:00
Vincent Petry
1b0c5e57e5 Fixed SMB rename function to overwrite target file 
When uploading files through WebDAV, a part file is created and a rename
operation is performed with the expectation that the part file
overwrites an existing file, if any.

This fix makes the SMB external storage delete the target file before
renaming, as smbclient doesn't support overwrite on move/rename.

Fixes #5348
 2013-11-25 11:17:38 +01:00
Morris Jobke
b82146eeee Merge pull request #5991 from owncloud/extstorage-mountpointvalidation 
Prevent using root as mount point for external storage
 2013-11-25 00:30:06 -08:00
Vincent Petry
2d947835b9 Now also preventing the user of "Shared" as mountpoint 2013-11-22 18:36:27 +01:00
Vincent Petry
c62cce8269 Moved default isReadable/isUpdatable impl into Common class 
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
 2013-11-22 18:21:17 +01:00
Vincent Petry
a49e873d3f Return plausible isReadable() default impl for ext storage 
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.

This fix makes the default impl of isReadable() use file_exists().

Fixes #5940
 2013-11-22 18:21:17 +01:00
Vincent Petry
0b2c9b823c Prevent using root as mount point for external storage 
Fixes #5981
 2013-11-21 17:22:12 +01:00
Vincent Petry
39cbdca429 Fixed path normalization to prevent dot dirs 
Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir
(only in older versions)
 2013-11-21 16:07:01 +01:00
Vincent Petry
391f267d38 Merge pull request #5897 from hkjolhede/master 
Fixed error-checking error in sftp.php
 2013-11-21 01:22:05 -08:00
Vincent Petry
e26500045f Fixed move operation to pass the whole URL as expected 
The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.

Fixes #5942
 2013-11-20 18:59:02 +01:00
Vincent Petry
5b6d1d79d0 Fixed SMB file deletion success detection 
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866
 2013-11-19 15:05:11 +01:00
Vincent Petry
8ab40f1959 Removing trailing dot in path that samba doesn't seem to like 
Fixes #5778
Added unit test for getId() and constructUrl()
 2013-11-19 15:05:11 +01:00
hkjolhede
3e2d4c1bc1 Fixed error-checking error in sftp.php 2013-11-15 21:10:09 +01:00
Christian Berendt
70276ca520 settings tags for optional parameters 2013-10-29 10:21:50 +01:00
Christian Berendt
235bf5269d extended parameter descriptions for Swift 2013-10-29 09:19:43 +01:00
Christian Berendt
dd82481f59 add configuration parameter to manually set the timeout of HTTP requests 2013-10-24 16:19:17 +02:00
Christian Berendt
128d3221cc make Swift::testLocal workable by using a delimiter 2013-10-23 08:07:59 +02:00
Christian Berendt
a1e956263c Revert "make Swift::testLocal workable by fixing the prefix used with the object listing in opendir" 
This reverts commit b92061da5a.
 2013-10-23 08:01:32 +02:00
Christian Berendt
b92061da5a make Swift::testLocal workable by fixing the prefix used with the object listing in opendir 2013-10-23 07:57:41 +02:00
Christian Berendt
506db6c63a rewrite of OC\Files\Storage\Swift 2013-10-22 14:59:09 +02:00
Christian Berendt
f0d04f3ac6 adjustment of the configuration parameters 2013-10-22 13:34:24 +02:00
Vincent Petry
b1f1357957 Added ownCloud backend for external storage 
To make it possible to use the short ownCloud URL (without specifying
webdav.php or remote.php), a new backend is available for ownCloud.

The user must specify the host + context path in the "Url" field (which
is mapped to the "host" parameter) and the subdir to mount in the "Root"
field.

This is to prevent confusion because some users forget to append
webdav.php or remote.php to the WebDAV URL.

Fixes #4923
 2013-10-09 17:30:22 +02:00
Thomas Müller
9637ca3ae8 Merge pull request #5070 from owncloud/smb-streamwrapper-fixes 
Various fixes for the streamwrapper based SMB backend
 2013-10-09 03:05:51 -07:00
Lennart Rosam
5470700c9a Update file to meet coding standarts 2013-10-07 01:08:39 +02:00
Lennart Rosam
72ad309920 Actually test the connection 2013-10-07 01:08:38 +02:00
Lennart Rosam
b9a948b597 Fixes #4129 2013-10-07 01:08:38 +02:00
Robin Appelman
de43515cfa fix recursive delete for smb 2013-10-01 22:33:58 +02:00
Robin Appelman
29deef38b2 fix using touch to create a file for smb 2013-10-01 22:31:22 +02:00
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Thomas Müller
3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller
ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Thomas Müller
d63ca25a94 proper test for use_logon_credentials 2013-09-10 12:35:14 +02:00
Thomas Müller
36e7a7c29b use \OC::$session instead of $_SESSION 2013-09-10 12:34:41 +02:00
Arthur Schiwon
c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Arthur Schiwon
ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Bart Visscher
ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master 
Clean 3rdparty mess master
 2013-08-28 06:12:58 -07:00
Georg Ehrke
cbeccb2fcd Merge branch 'master' into readdir-strict-equals 2013-08-19 17:30:56 +02:00
Thomas Müller
95e1b62940 Merge pull request #4510 from owncloud/f_e_webdav_urlencoding 
Fix files_external webdav up and download when path contains ' '
 2013-08-19 05:13:20 -07:00
icewind1991
d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
Robin Appelman
c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Jörn Friedrich Dreyer
89c928c3be replace ' ' with '%20' in urls for curl 2013-08-19 11:09:55 +02:00
Thomas Müller
6c518797ef fixing require path 2013-08-18 19:14:14 +02:00
Kondou
c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 
Add newlines at the end of files
 2013-08-18 07:16:15 -07:00
Robin Appelman
d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Thomas Müller
7575186fa6 moving Dropbox and smb4php 3rdparty code over to the apps 2013-08-17 18:20:20 +02:00
Bart Visscher
29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller
05549884c6 no files external for SMB on windows 2013-08-15 12:00:02 +02:00
Alexander Bogdanov
72ad843203 Fixing owncloud/core#4301 
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
 2013-08-02 23:18:29 +04:00
Jörn Friedrich Dreyer
77dad7070d Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc 
added @var tags
 2013-08-01 07:40:01 -07:00
Christian Berendt
5a4c39207e write all catched exception messages to the log 2013-08-01 10:08:41 +02:00
Christian Berendt
3e53e25cd1 added @var tags 2013-08-01 10:05:01 +02:00
Robin Appelman
88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Robin Appelman
79832e9382 use output buffering when including the irods libraries 2013-07-24 16:10:14 +02:00
Bart Visscher
7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Michael Gapczynski
c904504365 Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing 2013-07-23 10:50:14 -04:00
Thomas Müller
7b28f5a82c Merge branch 'master' into ext-fs-irods-master 2013-07-22 11:40:28 +02:00
Thomas Müller
a2cdf8b91e Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3 
reworking of \OC\Files\Storage\AmazonS3
 2013-07-22 02:19:27 -07:00
Björn Schießle
da892d69ab if the file doesn't exists; create a new one. We use this to create new text files in the web interface 2013-07-22 09:15:19 +02:00
Thomas Müller
5cba09e931 fixing / adding comments 2013-07-16 11:35:48 +02:00
Michael Gapczynski
00e2b46017 Fix 'most' Google Drive tests 2013-07-13 11:02:07 -04:00
Thomas Müller
24b4806af4 Merge branch 'master' into googledrive 2013-07-12 09:43:04 +02:00
Christian Berendt
9965eb0295 fixing style issues 2013-07-10 16:12:48 +02:00
Christian Berendt
4fdf279395 use === instead of == 2013-07-10 16:09:22 +02:00
Christian Berendt
a8b2aa34a4 remove uneeded calls to touch 2013-07-10 16:07:41 +02:00
Christian Berendt
203df66c00 rewrote initialisation, added testing workaround 2013-07-10 07:47:15 +02:00
Christian Berendt
020803aa7e minimize waiting time 2013-07-08 16:06:08 +02:00
Christian Berendt
deda583fad wait methods are probably not working, just wait 2013-07-08 15:56:56 +02:00
Christian Berendt
882d5ad728 added exception messages 2013-07-08 15:10:10 +02:00
Christian Berendt
fdeb21ba5b wait until bucket exists after the creation 2013-07-08 15:00:07 +02:00
Christian Berendt
911e947fd7 check if used bucket name is valid 2013-07-08 14:59:09 +02:00
Christian Berendt
dc8ca00f1e fixed syntax error 2013-07-08 13:26:41 +02:00
Christian Berendt
d59291a8e7 remove needless check 2013-07-08 11:16:58 +02:00
Christian Berendt
0bc28dcb95 replaced substr with trim 2013-07-08 11:14:47 +02:00
Christian Berendt
adf0fe880c removed aws.phar and added extracted zip instead 2013-07-08 11:11:07 +02:00
Christian Berendt
b3d6517c62 use us-west-1 as default region for Amazon S3 2013-07-03 18:56:51 +02:00
Christian Berendt
839ab7f2e6 fixing rmdir in \OC\Files\Storage\AmazonS3 2013-07-03 18:33:15 +02:00
Christian Berendt
8e5474394e reworking and extending \OC\Files\Storage\AmazonS3 2013-07-03 18:01:14 +02:00
Christian Berendt
32597c380a adding several new parameters 2013-07-03 17:58:44 +02:00
Thomas Mueller
0f32c5ec34 Merge branch 'master' into ext-fs-irods-master 2013-06-19 22:14:58 +02:00
Thomas Mueller
2772b1dd95 update to latest master 2013-06-06 23:28:08 +02:00
Thomas Mueller
3170e3511b - implement touch() to at least create a file which doesn't exist 
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
 2013-06-06 23:23:53 +02:00
Michael Gapczynski
8793acfb4e substr storage id to prevent problems with storing the change id in appconfig 2013-06-04 18:07:14 -04:00
Thomas Mueller
1d7d5d2894 In cases where smb4php returns false of an empty array stat/( has to return false. 
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.

Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
 2013-06-01 00:06:23 +02:00
Michael Gapczynski
8be23efa73 Implement hasUpdated() to watch for changes on Google Drive side 2013-05-30 21:45:16 -04:00
Michael Gapczynski
b4bf6a8d3a Include 3rdparty Google Drive SDK 0.6.2 2013-05-17 14:33:37 -04:00
Michael Gapczynski
4bb9c4a42e Fix constant in last commit 2013-05-17 14:03:25 -04:00
Michael Gapczynski
5368c8dafa Prepare for #2013 fix 2013-05-17 11:42:14 -04:00
Michael Gapczynski
ee398ccbc2 Setting Redirect URI is not required here 2013-05-16 20:35:07 -04:00
Michael Gapczynski
d8c660c6d5 Switch to using Google Drive SDK, closes #2047 2013-05-16 20:09:32 -04:00
Thomas Mueller
31d8258d6c Merge branch 'master' into ext-fs-irods-master 2013-05-15 23:56:42 +02:00
Michael Gapczynski
657ff34c6c Merge pull request #3147 from owncloud/storage-mkdir-root 
Dont task external storages with creating their own root
 2013-05-01 16:35:44 -07:00
Robin Appelman
4c980b1a14 Set storage id for openstack swift backend 2013-05-01 00:24:34 +02:00
Robin Appelman
c05195a46d Dont task external storages with creating their own root 2013-04-26 17:40:31 +02:00
Thomas Mueller
331ad15d9b adding auth mode to ui and the url 2013-04-26 17:37:41 +02:00
Thomas Mueller
17ff5d486e Merge branch 'master' into ext-fs-irods-master 2013-04-26 13:29:48 +02:00
Markus Goetz
6141b24d96 External Storage: Check for curl in PHP 
If no curl is found, disable the storage that needs it.
 2013-04-23 12:36:30 +02:00
Thomas Mueller
cfbf81f978 checkbox in settings ui 2013-04-18 22:20:52 +02:00
Thomas Mueller
e1f5f00ec3 in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session. 
The stored credentials will be used for and interactions with the iRODS server.

Within the config UI a check box can be used to enable the credential reuse.
 2013-04-18 22:12:53 +02:00
Thomas Mueller
7dd3391117 initial integration with iRODS www.irods.org 
The used PHP API is hosted at https://code.renci.org/gf/project/irodsphp/
 2013-04-12 15:51:58 +02:00
Lukas Reschke
6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Robin Appelman
be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Michael Gapczynski
766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback 
External Storage UI Improvements
 2013-02-27 10:00:22 -08:00
Michael Gapczynski
25cf18f614 Fix undefined root parameter in Dropbox storage 2013-02-26 17:52:06 -05:00
Björn Schießle
8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Michael Gapczynski
4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Michael Gapczynski
702c27b0e6 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
 2013-02-19 19:12:14 -05:00
Frank Karlitschek
3878203679 Merge pull request #1731 from owncloud/unknown-freespace 
Give storage backends the option to define having no known free space
 2013-02-19 15:18:12 -08:00
Thomas Mueller
0e9b9f4f5f no pretty print 2013-02-19 00:48:38 +01:00
Robin Appelman
3bf9aa408e Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig 2013-02-18 15:13:25 +01:00
Robin Appelman
2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Thomas Müller
8e76a98d2f Merge pull request #1709 from owncloud/style-cleanup-files_external 
Style cleanup files_external
 2013-02-17 11:53:51 -08:00
Thomas Mueller
325746ae45 Merge branch 'master' into fix-googledrive 2013-02-17 09:41:37 +01:00
Jörn Friedrich Dreyer
cad65915a7 look where you are typing ... 2013-02-16 12:55:36 +01:00
Jörn Friedrich Dreyer
e1700c28fa pretty print json 2013-02-16 12:10:54 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +01:00
Robin Appelman
6da2c6c83e Create new mountconfig files in json 2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef Use a parser to read custom mount configuration instead of including the php files 2013-02-16 01:30:44 +01:00
Bart Visscher
6c197227d0 Join split translated strings 2013-02-15 15:58:52 +01:00
Bart Visscher
5616690506 Style cleanup files_external 2013-02-15 15:58:52 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00