Commit graph

949 commits

Author SHA1 Message Date
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