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

795 commits

Author SHA1 Message Date
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
Thomas Mueller
a814361ca7 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 23:01:54 +01:00
Thomas Mueller
318c0b3408 user name and password need to be encoded as well 
fixes #1652
 2013-02-12 15:56:31 +01:00
Thomas Mueller
6b594c1eb8 fixing namespace 2013-02-12 11:05:12 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Thomas Mueller
646d60ee83 fixing namespace 2013-02-12 11:00:38 +01:00
Michael Gapczynski
6eba790a75 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
 2013-02-11 20:27:05 -05:00
Michael Gapczynski
808a13922c Remove the leading slash from the filename for opendir 2013-02-11 17:55:44 -05:00
Thomas Mueller
0c1174770d use urlencode not rawurlencode 2013-02-11 21:25:29 +01:00
Thomas Mueller
392be78162 the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still ..... 2013-02-11 20:32:44 +01:00
Thomas Mueller
89bc26210a [files_external] removing function as it's the same in the base class - THX Robin 
Conflicts:
	apps/files_external/lib/smb.php
 2013-02-11 15:44:35 +01:00
hkjolhede
513bf0b999 Update apps/files_external/lib/config.php 
Corrected minor error
 2013-02-10 15:37:05 +01:00
Henrik Kjölhede
421bacc33a Final changes from icewind1991 2013-02-10 13:11:29 +01:00
Henrik Kjölhede
1df8a5a774 Updated phpseclib from git + requested style changes 2013-02-10 12:35:49 +01:00
Henrik Kjölhede
c6622301e5 Security bug 2013-02-09 23:49:21 +01:00
Henrik Kjölhede
bcf98879cb Just a little cleaner in touch 2013-02-09 23:33:01 +01:00
Henrik Kjölhede
9e42a36fd8 Update to touch 2013-02-09 23:29:58 +01:00
Henrik Kjölhede
674955d1b6 Spelling mistake 2013-02-09 20:35:48 +01:00
Henrik Kjölhede
96cfe37587 Update to conform to API changes 2013-02-09 19:08:39 +01:00
Henrik Kjölhede
3b029d551c corrected namespace 2013-02-09 15:57:33 +01:00
Henrik Kjölhede
81a281a140 Modified to new class structure 2013-02-09 14:12:17 +01:00
Henrik Kjölhede
41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Robin Appelman
54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Henrik Kjölhede
b1b2eafa50 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/lib/config.php
 2013-01-26 21:51:18 +01:00
hkjolhede
a26d50640f Update apps/files_external/lib/sftp.php 
Added cleaning the root path
 2013-01-26 19:46:23 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Michael Gapczynski
464dafd7d2 Make Google Drive storage id unique, before it was anonymousanonymous 2013-01-09 22:17:39 -05:00
Michael Gapczynski
fbcf62389c Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/lib/webdav.php
 2013-01-09 21:49:21 -05:00
Björn Schießle
43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client. 
This means that OC_Connector_Sabre_Client is no longer needed
 2013-01-08 17:44:28 +01:00
Thomas Mueller
4a345fd911 removing undefined $response 2013-01-06 23:28:58 +01:00
Michael Gapczynski
1137723b2a Remove unnecessary length parameter from last commit 2013-01-03 12:13:45 -05:00
Michael Gapczynski
38876fc98a Update old storage classes names to the new namespace during mounting 2013-01-03 12:07:04 -05:00
Michael Gapczynski
d275725e23 No longer need to create folders locally for external storage mount points 2012-12-29 13:43:44 -05:00
hkjolhede
ab4d52e980 Update apps/files_external/lib/sftp.php 
Created test() function as per @pull/1031
 2012-12-28 22:22:04 +01:00
Michael Gapczynski
ad902a9848 Move storage backend tests from constructor to test function 2012-12-28 12:00:48 -05:00
hkjolhede
ab31c3ef4e Update apps/files_external/lib/sftp.php 
Updated to using local 3rdparty + added a few missed braces.
 2012-12-27 21:00:20 +01:00
hkjolhede
be197d52b1 Update apps/files_external/lib/sftp.php 
Added copyright notice
 2012-12-27 19:47:46 +01:00
hkjolhede
00bfcd94ec Update apps/files_external/lib/sftp.php 
Added a little better exception handling, hopefully making it a little more robust
 2012-12-26 23:49:53 +01:00
hkjolhede
3375253e1d Update apps/files_external/lib/sftp.php 
Added checks for host keys and added exceptions thrown if constructor fails.
 2012-12-26 23:38:17 +01:00
hkjolhede
6aded84f10 Update apps/files_external/lib/config.php 
Adding support for SFTP mounts
 2012-12-26 18:03:16 +01:00
hkjolhede
08156cc57f Create sftp.php 
Adapter for SFTP using the pure php SSH library phpseclib
 2012-12-26 08:59:08 -08:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Michael Gapczynski
0dbf1d0260 Show status icons for mount points in external storage UI 2012-12-24 13:45:52 -05:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Frank Karlitschek
262fecbe39 proper escape the mountpoints. Fixes 
https://github.com/owncloud/core/issues/557
 2012-12-14 23:31:50 +01:00
Thomas Mueller
e427197dce ctor of OC_L10N requires the app name 2012-12-11 14:07:01 +01:00
Frank Karlitschek
e55a3637ce don't call shell_exec if safe_mode is on. 2012-12-11 13:20:20 +01:00
Frank Karlitschek
ca7882a7c6 disable not available external filesystems. Restructure the configuration a bit and improve naming 2012-12-10 21:44:43 +01:00
Frank Karlitschek
f3bd6d14ee add some output why some of the external filesystems might not work 2012-12-10 21:10:28 +01:00
Robin Appelman
be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Jörn Friedrich Dreyer
92df70b6e5 fix checkstyle for files_external app, add whitespace for readability 2012-11-30 16:27:11 +01:00
Robin Appelman
54240140b1 fix incorectly merged smb.php 2012-11-16 12:14:29 +01:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Diederik de Haas
6e6df6e410 Fixed new checkstyle issues in ftp.php from build #1341. 2012-11-10 00:46:50 +01:00
Diederik de Haas
3cc6df489f Fixed new checkstyle issues in swift.php from build #1341. 2012-11-10 00:45:49 +01:00
Diederik de Haas
051635412d Fixed new checkstyle issues from build #1341. 2012-11-10 00:40:32 +01:00
Robin Appelman
961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Arthur Schiwon
8b3ae4309b Fix mkdir and opendir warnings when path does not exist 2012-11-05 21:37:59 +01:00
Robin Appelman
972243d564 support string values ('true' and 'false') for configuring the secure parameter on external storage backends 
fixes #78
 2012-11-05 16:39:03 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller
0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller
1205749f8c Checkstyle: Fix the last two SpaceBeforeOpenBrace 2012-11-04 18:18:03 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman
6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Felix Moeller
dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Robin Appelman
7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Felix Moeller
561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
Felix Moeller
03581ef463 Correct a first issue Checkstyle is complaining about ... 
This is BracketsNotRequired
 2012-10-22 21:40:33 +02:00
Robin Appelman
33cabcf590 postpone the cost of setting up some of the external storage backends untill we actually need it 2012-10-21 22:04:45 +02:00
Robin Appelman
cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman
11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Robin Appelman
c099545b6d don't throw errors if certificate folder doesn't exist 2012-10-12 14:52:22 +02:00
Robin Appelman
141ff806c6 fix namespace problems for external storage backends 2012-10-11 23:17:59 +02:00
Robin Appelman
542869114a implement getId for the external storage providers 2012-10-11 23:06:57 +02:00
Robin Appelman
fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Robin Appelman
92ddefe5a6 fix filetype for smb storage backend 2012-10-11 22:18:34 +02:00
Robin Appelman
5698c8519a fix webdav storage backend when trying to open a non existing file for reading 2012-10-11 22:18:34 +02:00
Benjamin Liles
8336b3287e Various bug fixes for swift 2012-10-11 08:52:21 -05:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Robin Appelman
13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Björn Schießle
293484d1ee add directory while creating mount point 2012-10-09 15:18:21 +02:00
Robin Appelman
e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Robin Appelman
a203a4a1c7 add support to mount a specific folder from dropbox 2012-10-06 13:44:53 +02:00
Robin Appelman
93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Björn Schießle
3d2cd64a48 add a line break after every certificate 2012-09-21 16:54:08 +02:00
Robin Appelman
bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
285c198c36 EOL fixes 
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
 2012-09-07 14:10:00 +02:00
Thomas Mueller
ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Georg Ehrke
745f279fbc make use of OC_User::getHome in files_external app 2012-09-04 15:56:00 +02:00
Bart Visscher
0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Michael Gapczynski
68f5dc2a44 Remove unnecessary files 2012-08-20 21:22:23 -04:00
Michael Gapczynski
4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Michael Gapczynski
830676b475 Improve usability for configuring Dropbox and Google Drive external storage 2012-08-13 17:10:58 -04:00
Michael Gapczynski
98c7d40fcd Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct 2012-08-13 17:10:58 -04:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Michael Gapczynski
48f33be848 Only call mkdir() if the root folder does not exist for FTP external storage 2012-07-27 12:32:03 -04:00
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski
f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Robin Appelman
c9be9ab251 remove unused variables 2012-07-20 18:56:18 +02:00
Robin Appelman
3c2967074f remove unused variable from dropbox filestorage backend 2012-07-20 16:48:28 +02:00
Robin Appelman
1224d7ec01 minor fixes for the google filestorage backend 2012-07-20 16:47:26 +02:00
Robin Appelman
23c71b15a0 remove unused variables from webdav file backend 2012-07-20 16:35:51 +02:00
Bjoern Schiessle
32b476d6ec remove comments around code block 2012-07-09 10:19:19 +02:00
Bjoern Schiessle
7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Bjoern Schiessle
e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Bjoern Schiessle
963faf6458 CURLOPT_SSL_VERIFYPEER=false shouldn't be in master 2012-07-06 12:35:29 +02:00
Bjoern Schiessle
8353517969 use OC_Connector_Sabre_Client 2012-07-06 12:24:03 +02:00
Bjoern Schiessle
378fa2bc86 check if caview really exists 2012-07-05 12:17:33 +02:00
Bjoern Schiessle
f86ecb3bf7 send ca cert path to sabredav client 2012-07-05 11:28:32 +02:00
Bjoern Schiessle
5d61b85a1d allow users to upload ssl root certificates for the webdav client 2012-07-04 17:18:36 +02:00
Bjoern Schiessle
ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02:00
Michael Gapczynski
719c7f7f6e Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160 2012-06-29 13:01:00 -04:00
Bjoern Schiessle
60ec46f706 - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI 
- if secure is set to true add 's' to http
 2012-06-29 12:01:23 +02:00
Michael Gapczynski
db6139fd41 Don't overwrite fake directory stream for Amazon S3 storage 2012-06-27 19:44:52 -04:00
Michael Gapczynski
9b605969f1 Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend 2012-06-27 15:23:49 -04:00
Michael Gapczynski
b7f86cf282 Add Samba Share parameter to external storage UI 2012-06-27 12:24:21 -04:00
Michael Gapczynski
19f94774fb Don't overwrite fake directory stream for Dropbox and Google Drive 2012-06-27 12:04:33 -04:00
Michael Gapczynski
79da782892 Improve error handling of Dropbox storage backend 2012-06-26 20:37:50 -04:00
Michael Gapczynski
618a3c1d94 Fix removing personal mounts 2012-06-22 12:22:42 -04:00
Robin Appelman
ad4f066bac suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29 improve caching smb results a bit 2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c improve filecache support for smb 2012-06-17 02:54:23 +02:00
Michael Gapczynski
92083aa20c Fix upload for Google Drive; Google Documents List API documentation was misleading 2012-06-14 20:57:08 -04:00
Michael Gapczynski
bd01e93469 Add support for mounting Google Drive in external storage UI 2012-06-13 13:54:50 -04:00
Michael Gapczynski
5f80be7664 Add support for mounting Dropbox in external storage UI 2012-06-12 11:36:43 -04:00
Michael Gapczynski
3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Michael Gapczynski
ab41b57f62 Add Dropbox storage backend 2012-06-09 15:02:48 -04:00
Bart Visscher
ac36512102 Don't use substr to get first char of string 2012-06-08 21:38:10 +02:00
Michael Gapczynski
8fcdccdcdc Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage 2012-06-08 13:48:38 -04:00
Michael Gapczynski
4b3ae60558 Working UI for external storage mount configuration 2012-06-08 11:42:29 -04:00
Robin Appelman
4768510923 split share and root config for smb backend, also sanitize config a bit more 2012-06-08 01:29:55 +02:00
Michael Gapczynski
d334f33eba Initial support for Amazon S3 storage backend 
Conflicts:

	apps/files_external/tests/config.php
 2012-05-29 12:19:29 -04:00
Robin Appelman
a1539dace7 share code between smb and ftp filestorage backends 2012-05-24 19:41:32 +02:00
Robin Appelman
2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Michael Gapczynski
6d37b8567b Refactoring and upload support for Google Drive backend 2012-05-02 14:41:57 -04:00
Frank Karlitschek
8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Frank Karlitschek
93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Robin Appelman
5b70e2fb25 some performance improvements to the openstack swift backend 2012-04-25 00:12:12 +02:00
Robin Appelman
5cefd34660 emulate touch with custom mtime for swift backend 2012-04-19 00:25:47 +02:00
Robin Appelman
9a707e10bf add SWIFT (openstack object storage) storage backend 2012-04-18 20:54:28 +02:00
Jan-Christoph Borchardt
011132feb3 renaming remote storage support to External storage support to clear up naming conflict 2012-03-30 18:18:37 +02:00