6467369cad
make sure the root has a trailing slash
2015-02-16 13:52:11 +01:00
e98983485f
handle deleting non existing files
2015-02-16 13:52:11 +01:00
e5731b6e1a
Use better way to check for the existence of smbclient
2015-02-16 13:52:11 +01:00
d2255a1d30
New SMB storage backend
2015-02-16 13:52:11 +01:00
bd01ff135a
Merge pull request #13190 from is-apps/master-sftp-key
...
Add SFTP public key authentication support
2015-02-10 16:44:29 +01:00
3764515365
Allow saving incomplete external storage config
...
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
64f4f8fc84
Add support for SFTP key authentication
...
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
2015-01-14 17:00:34 +00:00
75e8b39826
Merge pull request #12879 from owncloud/mountconfig
...
Add mount specific options
2014-12-18 23:38:14 +01:00
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
d075b1d743
Add the storage id to the mount config
2014-12-17 14:22:03 +01:00
95a145f67f
Load mount specific options from the mount config
2014-12-17 14:03:50 +01:00
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
5eaa2214b8
Remove conditional check for 5.3 compatibility
2014-12-12 12:25:59 +01:00
e3de51078d
Merge pull request #12090 from AdamWill/google-rename-delete
...
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
57452a3641
Keep spaces out of the string
...
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
a369d78124
Use the mount config api for files_external
2014-12-04 16:47:30 +01:00
805be635fa
Only store user credentials when SMB_OC storage is enabled
...
Conflicts:
apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
415411a3d5
google: delete original after successful rename
...
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.
OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)
A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.
We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
a2457b5fb9
Merge pull request #6989 from AdamWill/google-1
...
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
c749570a06
Merge pull request #12411 from owncloud/unknown-command-windows
...
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
0274dcba57
Replace some more "command -v" calls with the Helper method
2014-11-25 18:10:03 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
284ba5b688
Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
...
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
c941c3fa51
Show warning when invalid user was passed
...
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
2014-11-14 16:43:23 +01:00
914f4cb6f2
Do not remove dir entry if it has the same name as the parent
...
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
3234c91557
google: drop duplicate path trim from opendir()
...
opendir() trims the path passed then calls getDriveFile() -
which immediately does the same trim operation. This breaks
opendir() on the root directory, which causes the failure of
the testStat() test when it checks the ctime of the root dir.
2014-11-10 12:00:27 -08:00
f76419d190
fix touch() when $mtime is set (Google wants RFC3339) #11267
...
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.
This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989 ).
2014-11-10 11:56:01 -08:00
c237acb395
google: disable compression when curl is not available
...
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
2014-11-07 22:52:07 -08:00
04369fb9cc
scrutinizer fix: explicitly declare Google class property $client
2014-11-06 21:28:05 -08:00
f9bd43ff03
scrutinizer fix: correct @return for getDriveFile()
2014-11-06 21:27:12 -08:00
62b859d66f
Migrate Google Drive storage app to v1.0.0 of the client library
2014-11-06 18:47:11 -08:00
69a3d8eb1a
fix files_external storage id migration
2014-10-31 14:25:55 +01:00
b3a04840b5
Add type hinting to functions
...
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
d060180140
Use function outside of loop
...
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
2d2a4741ce
Make files non executable
...
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
7c14a17361
Merge pull request #11721 from owncloud/fix-s3-regression
...
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
ca01530f57
Merge pull request #11726 from owncloud/s3-fixunittests
...
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
188effa433
Fix S3 folder creation for new AWS API
...
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
71dce48bd3
Fix S3 connection
2014-10-22 22:17:07 +02:00
075e8d8e86
Lazy initialize external storages
...
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
2014-10-22 12:42:36 +02:00
1c9004409b
guess mimetype on touch
2014-10-21 12:58:26 +02:00
ab5149f5df
Allow specifying protocol in ext storage OC config
...
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
9dea79e341
Merge pull request #11305 from owncloud/ext-updateetagonmount
...
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
f664a31dec
extract batchDelete(), better comments
2014-10-08 18:50:02 +02:00
0d0c9d0bb3
files_extern: remove empty Body and ContentLength in Amazon S3 mount
...
fixes #10501
Conflicts:
apps/files_external/lib/amazons3.php
2014-10-08 18:49:59 +02:00
aa3ad898a9
fix amazon s3 issues
...
folder size and mtime is always unknown in s3
more s3 fixes
make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings
reduce number of http calls on remove and rmdir
fix typo
2014-10-08 18:49:47 +02:00
26e242a8a4
Added PHP docs for etag propagator
2014-10-08 14:22:18 +02:00
bcf654127f
More phpdoc
2014-10-08 14:22:17 +02:00
1030f0a763
Hookup the etag propagator
2014-10-08 14:22:17 +02:00
5d7bd8be42
Add EtagPropagator to handle etag changes when external storages are changed
2014-10-08 14:22:17 +02:00
9a5d0f6084
Fix add/remove mountpoint hooks
2014-10-08 14:22:17 +02:00
6585eaa5df
Added failing unit tests for mount config hooks
2014-10-08 14:22:17 +02:00
0610937ac3
Added filesystem hooks for mount/unmount ext storage
2014-10-08 14:22:17 +02:00
11ac9ce28b
Fix copy overwrite for amazon s3
2014-09-17 15:52:00 +02:00
3b08b3fad4
Fix amazon s3 rename overwrite
2014-09-17 15:51:57 +02:00
6e12d830d5
Fix AmazonS3 rmdir on the root
2014-09-17 15:50:27 +02:00
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
4669ea3835
Merge pull request #10680 from helmutschneider/aws-2.6.15
...
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
a1f4a0601b
Fix hasUpdated for folders in swift backend
2014-09-05 13:23:10 +02:00
3d7aff84e5
Fix configuration of rackspace
2014-09-05 13:22:35 +02:00
d2979da864
Fix failing AmazonS3::touch on updated aws sdk
2014-09-03 12:09:12 +02:00
ecdbf00628
Move certificate management code to core
2014-08-31 10:45:10 +02:00
2b63c375a4
Merge pull request #10719 from owncloud/files-external-personal-undefined
...
Prevent undefined index error loading external storages
2014-08-29 11:59:34 +02:00
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
bffccdbea7
Add missing 'personal' mount configuration option
2014-08-29 09:08:46 +01:00
87167d3141
Prevent errors on broken SFTP config
2014-08-27 09:02:14 +01:00
5e2f627d3d
Merge pull request #10108 from owncloud/files_external-allowed-backend
...
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
240b952333
use S3Client::encodeKey(), fixes #8325
2014-08-14 21:46:50 +02:00
73607e5d16
Only load personal external storages for allowed backends
2014-08-01 17:15:46 +02:00
4886c8582d
Merge pull request #9529 from helmutschneider/fix-8326
...
Fixes #8326 : deletion of directories on S3
2014-08-01 14:04:21 +02:00
a27753dd80
Pass existing Net_SFTP object into Net_SFTP_Stream.
2014-07-18 15:47:13 +02:00
e18c8f23df
login() must be called after getServerPublicHostKey().
2014-07-12 20:41:35 +02:00
d02604b3fb
Add short description explaining how SFTP ext storage class works.
2014-07-12 13:58:49 +02:00
c8024934c0
The file providing the sftp:// scheme needs to be included manually.
2014-07-12 13:57:27 +02:00
ac75a24597
Converted an array to PHP5.3 compatible version
2014-07-09 14:54:03 +02:00
e44a7aa034
Fixes #8326 : deletion of directories on S3
2014-07-08 22:41:11 +02:00
599ab7a802
Fix Signiture Does Not Match when mounting Amazon S3 external storage
...
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.
When we are at the top of a S3 bucket there is a need(?) to have a directory
name. Per standard Unix the name picked was '.' (dot or period). This
choice exercises the aws-sdk bug.
This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'. We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable. Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().
An example where we don't process through clean key would be
'Key' => $path.'/',
Use correct relationship operator
Per feed back use === instead of ==
use '/' instead of '<root>'
2014-07-08 10:16:48 +02:00
5e6f6da786
Fix warnings when personal is not set
2014-07-01 13:32:57 +02:00
8977a68548
Use filtered list for ext storage list mounts API
...
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.
Since that call was missing the backend name which is important for the
UI, this one was added as well.
2014-06-30 12:33:11 +02:00
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
c745240543
Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies
2014-06-27 08:52:28 +02:00
42e9d49d72
update files_external swift to php-opencloud v1.9.2
2014-06-25 17:15:59 +02:00
544963f414
Allow adding object stores with the files_external mount config
2014-06-24 14:36:57 +02:00
d24c0f4d42
Dont allow opening writable streams on a read only dav mount
2014-06-23 14:35:19 +02:00
be93b0d01d
Fix permissions functions for webdav external storages
2014-06-14 10:22:38 +02:00
3f2cb39aba
Properly set read permissions for webdav storages
2014-06-14 10:14:08 +02:00
21ced89beb
Dont return false for internalPath
2014-06-14 10:13:24 +02:00
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
710d017eec
Added more columns to ext storage list
...
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
01c2c3107a
Added external storage list in files app
2014-06-06 15:06:26 +02:00
a66c2e6a47
Fix the removeMount for personal mounts
2014-06-06 09:55:59 +02:00
cabe2873c4
Make personal external mount points (re)movable from the files app
2014-06-06 09:55:59 +02:00
d0eb8f8668
Merge pull request #8880 from owncloud/webdav-read-permissions
...
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
9eb177e8bc
Use the permissions exposed by ownCloud for webdav external storages
2014-06-04 18:19:52 +02:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
17cbfc714a
use phpseclib from 3rdparty
...
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
6ffb139a46
Merge pull request #8658 from realriot/master
...
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
9151d72507
Treat 'all users' as 'global'
...
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
05642733a3
Add storage priority support
...
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.
The priority order is as follows:
* Personal
* User
* Group
* Global
Within each mount type, the mount with the highest priority is active.
The storage backend defaults were chosen to be the following:
* Local - 150
* Remote storage - 100
* SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
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
9128900c56
drop files_irods from apps_external
2014-04-28 12:39:28 +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
e3b9a86184
remove duplicate method checkDependencies()
2014-04-03 17:17:44 +02:00
c6976d89a6
use command -v to detect if smbclient exists
2014-04-03 17:09:40 +02:00
14a5381977
Merge branch 'master' into fs-backend-registration
...
Conflicts:
apps/files_external/templates/settings.php
2014-04-03 17:04:16 +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
ff9a4a6d91
Added cURL dependency for Amazon S3, Dropbox and SWIFT
...
Conflicts:
apps/files_external/lib/amazons3.php
apps/files_external/lib/swift.php
2014-04-03 16:38:43 +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
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
2a08e35d72
Fix swift touch operation
...
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
1f6259d9c2
Merge pull request #7875 from Xenopathic/files_external_smb_auto
...
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
fa00a18677
Fixed mtime reading from OpenStack API
...
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
a1dca821f9
Use braces on single line if statements
2014-03-26 15:11:09 +00: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
86aa6104e6
Revoke sharable permission on automatic SMB shares
...
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
3445c062ec
Use loginname instead of display name
...
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
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
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +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
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +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
38d6c56249
Merge pull request #7294 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
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
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +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
bf95532fb6
Removed unused writeBack method
2014-01-23 15:05:05 +01:00
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
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
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
b245e2e3d8
Fixing tab/space coding style
...
Only set SSL things when ```$this->secure``` is ```true```
2013-12-17 09:38:43 +01:00
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
3b7905364f
Fixed test function for S3
...
Fixes #5752
2013-12-03 12:26:08 +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
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
84f3dd15a6
Add trailing slash in FTP root path when missing
...
Fixes #6093
2013-11-28 11:45:26 +01:00
30e086fb53
Fixed SFTP storage to overwrite on rename
2013-11-26 16:32:44 +01:00
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
a48fc120d0
Merge pull request #6054 from owncloud/extstorage-dropboxfixes
...
Fixed various Dropbox issues + unit tests
2013-11-26 04:48:54 -08:00
e102eec89a
Return true when touch succeeds
2013-11-26 12:47:00 +01:00
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
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
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
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
2d947835b9
Now also preventing the user of "Shared" as mountpoint
2013-11-22 18:36:27 +01:00
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
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
0b2c9b823c
Prevent using root as mount point for external storage
...
Fixes #5981
2013-11-21 17:22:12 +01:00
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
391f267d38
Merge pull request #5897 from hkjolhede/master
...
Fixed error-checking error in sftp.php
2013-11-21 01:22:05 -08:00
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
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
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
3e2d4c1bc1
Fixed error-checking error in sftp.php
2013-11-15 21:10:09 +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
128d3221cc
make Swift::testLocal workable by using a delimiter
2013-10-23 08:07:59 +02:00
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
b92061da5a
make Swift::testLocal workable by fixing the prefix used with the object listing in opendir
2013-10-23 07:57:41 +02:00
506db6c63a
rewrite of OC\Files\Storage\Swift
2013-10-22 14:59:09 +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
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
5470700c9a
Update file to meet coding standarts
2013-10-07 01:08:39 +02:00
72ad309920
Actually test the connection
2013-10-07 01:08:38 +02:00
b9a948b597
Fixes #4129
2013-10-07 01:08:38 +02:00
de43515cfa
fix recursive delete for smb
2013-10-01 22:33:58 +02:00
29deef38b2
fix using touch to create a file for smb
2013-10-01 22:31:22 +02:00
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
3b835ea1b6
never hack late night
2013-09-11 01:11:57 +02:00
ec255b52be
fixing boolean handling
2013-09-11 00:49:45 +02:00
d63ca25a94
proper test for use_logon_credentials
2013-09-10 12:35:14 +02:00
36e7a7c29b
use \OC::$session instead of $_SESSION
2013-09-10 12:34:41 +02:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
ada15a2b8e
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
...
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
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
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
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
6c518797ef
fixing require path
2013-08-18 19:14:14 +02:00
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
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
7575186fa6
moving Dropbox and smb4php 3rdparty code over to the apps
2013-08-17 18:20:20 +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
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
77dad7070d
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
...
added @var tags
2013-08-01 07:40:01 -07:00
5a4c39207e
write all catched exception messages to the log
2013-08-01 10:08:41 +02:00
3e53e25cd1
added @var tags
2013-08-01 10:05:01 +02:00
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
79832e9382
use output buffering when including the irods libraries
2013-07-24 16:10:14 +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
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
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
2013-07-22 11:40:28 +02:00
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
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
5cba09e931
fixing / adding comments
2013-07-16 11:35:48 +02:00
00e2b46017
Fix 'most' Google Drive tests
2013-07-13 11:02:07 -04:00
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
9965eb0295
fixing style issues
2013-07-10 16:12:48 +02:00
4fdf279395
use === instead of ==
2013-07-10 16:09:22 +02:00
a8b2aa34a4
remove uneeded calls to touch
2013-07-10 16:07:41 +02:00
203df66c00
rewrote initialisation, added testing workaround
2013-07-10 07:47:15 +02:00
020803aa7e
minimize waiting time
2013-07-08 16:06:08 +02:00
deda583fad
wait methods are probably not working, just wait
2013-07-08 15:56:56 +02:00
882d5ad728
added exception messages
2013-07-08 15:10:10 +02:00
fdeb21ba5b
wait until bucket exists after the creation
2013-07-08 15:00:07 +02:00
911e947fd7
check if used bucket name is valid
2013-07-08 14:59:09 +02:00
dc8ca00f1e
fixed syntax error
2013-07-08 13:26:41 +02:00
d59291a8e7
remove needless check
2013-07-08 11:16:58 +02:00
0bc28dcb95
replaced substr with trim
2013-07-08 11:14:47 +02:00
adf0fe880c
removed aws.phar and added extracted zip instead
2013-07-08 11:11:07 +02:00
b3d6517c62
use us-west-1 as default region for Amazon S3
2013-07-03 18:56:51 +02:00
839ab7f2e6
fixing rmdir in \OC\Files\Storage\AmazonS3
2013-07-03 18:33:15 +02:00
8e5474394e
reworking and extending \OC\Files\Storage\AmazonS3
2013-07-03 18:01:14 +02:00
32597c380a
adding several new parameters
2013-07-03 17:58:44 +02:00
0f32c5ec34
Merge branch 'master' into ext-fs-irods-master
2013-06-19 22:14:58 +02:00
2772b1dd95
update to latest master
2013-06-06 23:28:08 +02:00
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
8793acfb4e
substr storage id to prevent problems with storing the change id in appconfig
2013-06-04 18:07:14 -04:00
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
8be23efa73
Implement hasUpdated() to watch for changes on Google Drive side
2013-05-30 21:45:16 -04:00
b4bf6a8d3a
Include 3rdparty Google Drive SDK 0.6.2
2013-05-17 14:33:37 -04:00
4bb9c4a42e
Fix constant in last commit
2013-05-17 14:03:25 -04:00
5368c8dafa
Prepare for #2013 fix
2013-05-17 11:42:14 -04:00
ee398ccbc2
Setting Redirect URI is not required here
2013-05-16 20:35:07 -04:00
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
2013-05-16 20:09:32 -04:00
31d8258d6c
Merge branch 'master' into ext-fs-irods-master
2013-05-15 23:56:42 +02:00
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
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
c05195a46d
Dont task external storages with creating their own root
2013-04-26 17:40:31 +02: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
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
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
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
25cf18f614
Fix undefined root parameter in Dropbox storage
2013-02-26 17:52:06 -05:00
8c9d0d1f5b
cleanPath needs to be public
2013-02-26 12:24:52 +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
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
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
8e76a98d2f
Merge pull request #1709 from owncloud/style-cleanup-files_external
...
Style cleanup files_external
2013-02-17 11:53:51 -08:00
325746ae45
Merge branch 'master' into fix-googledrive
2013-02-17 09:41:37 +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
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
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
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
318c0b3408
user name and password need to be encoded as well
...
fixes #1652
2013-02-12 15:56:31 +01:00
6b594c1eb8
fixing namespace
2013-02-12 11:05:12 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
646d60ee83
fixing namespace
2013-02-12 11:00:38 +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
808a13922c
Remove the leading slash from the filename for opendir
2013-02-11 17:55:44 -05:00
0c1174770d
use urlencode not rawurlencode
2013-02-11 21:25:29 +01:00
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
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
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
421bacc33a
Final changes from icewind1991
2013-02-10 13:11:29 +01:00
1df8a5a774
Updated phpseclib from git + requested style changes
2013-02-10 12:35:49 +01:00
c6622301e5
Security bug
2013-02-09 23:49:21 +01:00
bcf98879cb
Just a little cleaner in touch
2013-02-09 23:33:01 +01:00
9e42a36fd8
Update to touch
2013-02-09 23:29:58 +01:00
674955d1b6
Spelling mistake
2013-02-09 20:35:48 +01:00
96cfe37587
Update to conform to API changes
2013-02-09 19:08:39 +01:00
3b029d551c
corrected namespace
2013-02-09 15:57:33 +01:00
81a281a140
Modified to new class structure
2013-02-09 14:12:17 +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
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
a26d50640f
Update apps/files_external/lib/sftp.php
...
Added cleaning the root path
2013-01-26 19:46:23 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Robin Appelman
Vincent Petry
Ross Nicoll
Morris Jobke
Jörn Friedrich Dreyer
Lukas Reschke
Volkan Gezer
Adam Williamson
Robin Appelman
Joas Schilling
André Gaul
Johan Björk
Thomas Müller
Robin McCorkell
Stephan Peijnik
Andreas Fischer
Christopher T. Johnson
Sascha Schmidt
Bjoern Schiessle
Lukas Reschke
Philipp Kapfer
Jan-Christoph Borchardt
Frank Karlitschek
Philipp Schmitt
Scrutinizer Auto-Fixer
Tigran Mkrtchyan
Michael Monreal
Carlos Cerrillo
Morris Jobke
hkjolhede
Christian Berendt
Lennart Rosam
Arthur Schiwon
Bart Visscher
Georg Ehrke
icewind1991
Kondou
Alexander Bogdanov
Michael Gapczynski
Markus Goetz