08a8a409d6
Extract mount point merging logic into separate function
2014-05-13 00:14:30 +01:00
af2b7634ee
Merge pull request #8293 from owncloud/files_external_fix_readData
...
Fix issue with personal mount points and sharing
2014-05-08 11:01:54 +02:00
22e0a4b9a8
external storages: allow to mount a folder called "Shared", it is no longer a reserved name
2014-04-23 12:54:25 +02:00
abfd7ecb72
Permit personal mount points to be used for sharing
...
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.
`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
2014-04-21 21:42:35 +01:00
2454759af7
Check whether the user has permissions to add personal storage backends
2014-04-13 11:01:50 +02:00
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
730bca98b4
Moved dependency checks to end of class files
...
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends
Conflicts:
apps/files_external/lib/google.php
apps/files_external/lib/swift.php
apps/files_external/templates/settings.php
2014-04-03 16:46:22 +02:00
46379113a1
Changed dependency check messages from warnings to notes
...
Added check for duplicate dependency check messages to display only the first
2014-04-03 16:31:54 +02:00
8ca897df76
Added cURL dependency check to Google Drive and WebDAV backend
...
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing
Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php
2014-04-03 16:30:48 +02:00
f7da4280ca
Modified app to dynamically register backends instead of hard-coding them
...
Moved dependency check to the individual backends instead of the config
Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
2014-04-03 16:21:52 +02:00
cd5ebac7c4
Fix error in $isPersonal setting
2014-03-26 14:37:29 +00:00
b077528087
Perform proper checking for share availability
...
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
cac4aaa8c4
Rename SMB_Auto to SMB_OC and change visible name
...
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
ba63e46b5e
SMB/CIFS mount using OwnCloud logon credentials
...
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.
Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
b656c68ede
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
...
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
8d95c0d013
Pretty print mount.json when possible
2014-03-26 11:32:03 +01:00
d95fde3924
Removed comment
2014-03-20 15:24:05 +01:00
1e4e0cfcd5
Lazy load phpseclib in ext storage config
2014-03-20 13:21:34 +01:00
cf23defa52
Fix typo in mount loading
2014-03-20 12:52:09 +01:00
9116c39a82
Fixed ext storage password field order issue
...
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
8e0a5ed5df
Added tests to check mount point list for a target user
2014-03-19 15:21:54 +01:00
4cb53f77b2
Moved external storage mounting code to files_external app
...
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
40a70ecf79
Added password obfuscation for external storage config
...
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
1f79f368ef
Added unit tests for when adding ext storage mount points
...
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
doing an actual check/connection (note: this is necessary because the
static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
8ababef4cd
Fix validation of allowed personal backend
2014-03-18 17:54:14 +01:00
e3156fa5ad
Merge pull request #7354 from pschmitt/master
...
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
bd86642747
Merge pull request #7261 from owncloud/issue/6793
...
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
f42b6f1a4e
Merge pull request #7525 from owncloud/fix_S3string
...
fix https://github.com/owncloud/core/issues/6825
2014-03-04 14:30:30 +01:00
0bca969e99
fix https://github.com/owncloud/core/issues/6825
2014-03-04 12:38:56 +01:00
932c4ee927
Allow admins to disable certain external storages for users
...
Fix issue #6793
2014-02-26 15:02:41 +01:00
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
539ea0882b
Fixed mount config path
2014-02-24 10:35:24 +01:00
f1475671ab
Merge branch 'master' into extstorage-configclass
2014-02-21 15:51:41 +01:00
43b1d81f77
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-02-21 13:45:57 +01:00
6cb64a4fce
Fix code to search for mount.json in custom data folders
2014-02-20 18:34:27 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
b060a17b59
Added extra checks for ext storage class
2014-02-20 10:40:10 +01:00
49f2014e0c
Revert "Added extra checks for ext storage class"
...
This reverts commit 9e9a5b9ea1
2014-02-20 10:01:49 +01:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
658af627ce
External FTP Storage should request hostname instead of URL
...
Fix issue #6277
2014-02-12 18:20:10 +01:00
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
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
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
a8d20e0919
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
...
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
f52a9e5e42
Silence output of 'which' command used in smbclient detection
2013-12-27 18:10:47 +01:00
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
76b1fcbf27
Fixed Amazon S3 ext storage config UI
...
Optional parameters are now really optional
Fixes #5861
2013-12-03 12:26:08 +01:00
2d947835b9
Now also preventing the user of "Shared" as mountpoint
2013-11-22 18:36:27 +01:00
0b2c9b823c
Prevent using root as mount point for external storage
...
Fixes #5981
2013-11-21 17:22:12 +01:00
70276ca520
settings tags for optional parameters
2013-10-29 10:21:50 +01:00
235bf5269d
extended parameter descriptions for Swift
2013-10-29 09:19:43 +01:00
dd82481f59
add configuration parameter to manually set the timeout of HTTP requests
2013-10-24 16:19:17 +02:00
f0d04f3ac6
adjustment of the configuration parameters
2013-10-22 13:34:24 +02:00
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
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
05549884c6
no files external for SMB on windows
2013-08-15 12:00:02 +02:00
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
2013-07-22 11:40:28 +02:00
32597c380a
adding several new parameters
2013-07-03 17:58:44 +02:00
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
2013-05-16 20:09:32 -04:00
331ad15d9b
adding auth mode to ui and the url
2013-04-26 17:37:41 +02:00
17ff5d486e
Merge branch 'master' into ext-fs-irods-master
2013-04-26 13:29:48 +02:00
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
cfbf81f978
checkbox in settings ui
2013-04-18 22:20:52 +02:00
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
6552996734
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 13:21:21 +03:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
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
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
2013-02-18 15:13:25 +01:00
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
cad65915a7
look where you are typing ...
2013-02-16 12:55:36 +01:00
e1700c28fa
pretty print json
2013-02-16 12:10:54 +01:00
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
6c197227d0
Join split translated strings
2013-02-15 15:58:52 +01:00
5616690506
Style cleanup files_external
2013-02-15 15:58:52 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
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
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
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
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
d275725e23
No longer need to create folders locally for external storage mount points
2012-12-29 13:43:44 -05:00
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
6aded84f10
Update apps/files_external/lib/config.php
...
Adding support for SFTP mounts
2012-12-26 18:03:16 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
0dbf1d0260
Show status icons for mount points in external storage UI
2012-12-24 13:45:52 -05:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
262fecbe39
proper escape the mountpoints. Fixes
...
https://github.com/owncloud/core/issues/557
2012-12-14 23:31:50 +01:00
e427197dce
ctor of OC_L10N requires the app name
2012-12-11 14:07:01 +01:00
e55a3637ce
don't call shell_exec if safe_mode is on.
2012-12-11 13:20:20 +01:00
ca7882a7c6
disable not available external filesystems. Restructure the configuration a bit and improve naming
2012-12-10 21:44:43 +01:00
f3bd6d14ee
add some output why some of the external filesystems might not work
2012-12-10 21:10:28 +01:00
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
8b3ae4309b
Fix mkdir and opendir warnings when path does not exist
2012-11-05 21:37:59 +01:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
c099545b6d
don't throw errors if certificate folder doesn't exist
2012-10-12 14:52:22 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
293484d1ee
add directory while creating mount point
2012-10-09 15:18:21 +02:00
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
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
745f279fbc
make use of OC_User::getHome in files_external app
2012-09-04 15:56:00 +02:00
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
Robin McCorkell
Vincent Petry
Bjoern Schiessle
Lukas Reschke
Thomas Müller
Philipp Kapfer
Robin Appelman
Jan-Christoph Borchardt
Frank Karlitschek
Joas Schilling
Philipp Schmitt
Jörn Friedrich Dreyer
Tigran Mkrtchyan
Michael Monreal
Carlos Cerrillo
Christian Berendt
Arthur Schiwon
Bart Visscher
Michael Gapczynski
Markus Goetz
hkjolhede
Felix Moeller
Georg Ehrke
Michael Gapczynski