Commit Graph

44 Commits

Author SHA1 Message Date
Lukas Reschke ba5d3fb96b Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
2014-09-16 13:58:12 +02:00
Bjoern Schiessle f23116ce50 also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero 2014-09-15 13:00:04 +02:00
Robin McCorkell 99d41bec5d Show original path information in trashbin and sharing views
Path will only be shown if in subdirectory, not in root.
2014-09-11 15:45:42 +01:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Bjoern Schiessle 40fe1275de throw exception if file is to large for trash bin 2014-07-15 13:56:02 +02:00
Morris Jobke 1973fdb11d Merge pull request #9093 from owncloud/remove_unused_code
remove unused code
2014-06-19 01:17:36 +02:00
Bjoern Schiessle 05cd150fd2 add additional tests for the trash bin 2014-06-18 14:41:16 +02:00
Bjoern Schiessle e06fa200b3 make sure that we always use the right user 2014-06-18 14:41:16 +02:00
Bjoern Schiessle e20bb71a42 remove unused code 2014-06-18 13:26:42 +02:00
Bjoern Schiessle b486f48fbc fix trash bin expire operation and add unit tests 2014-06-17 22:36:30 +02:00
Thomas Müller 6fcd135d0e table files_trashsizes was still used in some locations -> removed 2014-06-05 10:44:32 +02:00
Thomas Müller a2db53b928 Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Thomas Müller 9f3fcf036c fixing typo 2014-06-04 09:36:27 +02:00
Bjoern Schiessle 05cf34ea1f get files in trash from file cache 2014-06-03 16:45:11 +02:00
Bjoern Schiessle a7f6a051ad return size '0' if the trashbin folder doesn't exists yet 2014-06-02 18:56:04 +02:00
Morris Jobke 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
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Sjors van der Pluijm 49822dfcdb refs #8376; spaces=>tabs 2014-04-29 14:59:47 +02:00
Sjors van der Pluijm 54f482ff9c refs #8376; added comment and applied patch on other files 2014-04-28 19:32:25 +02:00
Robin McCorkell 869e7a51f0 Prevent error in files_trashbin
`glob` can return FALSE when the directory is empty, instead of an empty array,
causing an error at `foreach`.

"Note: On some systems it is impossible to distinguish between empty match and
an error."

See http://www.php.net/manual/en/function.glob.php -> Return Values
2014-04-13 14:51:33 +01:00
Robin McCorkell fa8814902e Adjust logic for deciding if trashbin empty
Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
2014-04-13 13:49:04 +01:00
Robin Appelman 6b66b42f6e catch the case where files_trashbin/files doesn't exist 2014-03-24 12:33:44 +01:00
Robin Appelman 38b1529c2a More robust way to check if the folder is empty 2014-03-17 17:03:32 +01:00
Robin Appelman 332c14a878 Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache 2014-03-17 16:35:08 +01:00
Georg Ehrke 0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Bjoern Schiessle 4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Bjoern Schiessle eab844e226 if file is not in db, fall back to restore file to the users root 2014-03-10 15:13:28 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Thomas Müller 1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Robin Appelman 181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Vincent Petry d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Vincent Petry ca57a849ff When reading the size of "files" mountpoints need to be excluded
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
2014-01-20 17:11:33 +01:00
Bjoern Schiessle 592ae16603 remove old code 2014-01-15 14:35:17 +01:00
Bjoern Schiessle f11f65c6a5 copy files to owner trash recursively 2014-01-15 14:27:23 +01:00
Bjoern Schiessle 6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Bjoern Schiessle 8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Bjoern Schiessle 5d2299eab8 only create complete share key if we know the exact path 2013-11-26 13:30:59 +01:00
Bjoern Schiessle f8fcd567a7 move files to owners trash 2013-11-25 16:51:31 +01:00
Georg Ehrke 90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Jörn Friedrich Dreyer 9e39118b52 namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00