Commit Graph

316 Commits

Author SHA1 Message Date
Björn Schießle fbf34f3bf6 fix some var names according to our style guide 2013-07-12 11:25:23 +02:00
Björn Schießle 2f0d88cae4 adjust comments 2013-07-12 11:25:12 +02:00
Björn Schießle e7959d3da0 fix typo in comment 2013-07-12 11:25:04 +02:00
Björn Schießle e8760d7284 also expire versions on rename, to update the history more regularly 2013-07-12 11:24:52 +02:00
Björn Schießle d6c1e5490d it is enough to call the expire function once 2013-07-12 11:24:31 +02:00
Björn Schießle e159143165 call expire function before writing the new version to make sure to have enough free space 2013-07-12 11:24:19 +02:00
Björn Schießle efb026c664 don't normalize absolute local path 2013-06-17 14:42:18 +02:00
Björn Schießle f91b02e9b6 only escape glob pattern 2013-06-14 15:07:06 +02:00
Florin Peter b3834b49c3 prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations 2013-05-30 22:05:52 +02:00
Björn Schießle bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Björn Schießle ddde1b65db adapt free space calculation to the way it is done for the trash bin 2013-04-17 10:43:12 +02:00
Björn Schießle 544a46c690 remove used space for versions from db is a user was deleted 2013-04-11 14:39:56 +02:00
Björn Schießle 5924d1d95c add backticks around table names 2013-03-25 12:29:13 +01:00
Björn Schießle 418fb98c40 remove backticks around table names 2013-03-15 12:10:21 +01:00
Björn Schießle e37e884d7a add backtick for db queries to prevent postgresql errors 2013-03-15 12:10:07 +01:00
Björn Schießle f78594c0ae fix var name 2013-03-14 17:09:48 +01:00
Björn Schießle 93b2ada6f6 fix var name 2013-03-14 17:08:16 +01:00
Björn Schießle 0cf50d63bf create new version if the same file is uploaded again over the web interface 2013-03-14 16:47:59 +01:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Björn Schießle 8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle 45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Björn Schießle 48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Tom Needham 370f202251 Rebase to current master 2013-03-05 00:25:56 +00:00
Björn Schießle 2a5d9ca9c5 damn copy&paste, fix wrong var name 2013-03-04 12:59:48 +01:00
Björn Schießle 21bad1fcc0 fix type in var name 2013-03-04 12:33:16 +01:00
Björn Schießle 94dab96dba fix quota calculation for trash and versions 2013-03-04 12:17:57 +01:00
Björn Schießle 70014d37dc fix expire function 2013-03-04 17:20:14 +01:00
Björn Schießle e81b6395d4 make sure that the version app always work on the users real home folder and not on the mount point 2013-03-01 13:54:26 +01:00
Björn Schießle 5c7e3cf2e2 escape regular expressions; fix typo in variable name 2013-02-27 10:51:32 +01:00
Björn Schießle b917646516 fix quota calculation 2013-02-25 16:12:44 +01:00
Björn Schießle 4c980a4851 Merge branch 'master' into update-expire-function
Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
Bernhard Posselt 3f48bebe92 Merge pull request #1827 from owncloud/fix_getVersions
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
Björn Schießle 632ca9f06d Merge branch 'master' into update-expire-function
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Björn Schießle 9edec542c5 mount users home before write/read file to it, necessary to deal with external homes 2013-02-22 13:15:47 +01:00
Bart Visscher 59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Bart Visscher db8dbb9847 Style cleanup files_versions 2013-02-21 23:47:21 +01:00
Björn Schießle 0a5457c550 fix getVersions(), we need to get the correct user and filename 2013-02-21 14:40:16 +01:00
Björn Schießle c24ec867f9 calculate versions size per user 2013-02-21 12:20:29 +01:00
Björn Schießle d426a09f90 Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
Versioning app use new filesystem api
2013-02-20 03:38:37 -08:00
Björn Schießle efa024cc62 fix getUidAndFilename() function 2013-02-18 11:19:40 +01:00
Björn Schießle 08b68aac6c check if glob() returns any results, fix for stable45 was already approved by pull request #1695 2013-02-15 12:29:52 +01:00
Björn Schießle b05f05ec4a make store function static 2013-02-14 14:26:49 +01:00
Björn Schießle 87b98dab25 use new filesystem to mount users home 2013-02-14 11:56:41 +01:00
Bart Visscher 5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Björn Schießle ff09a1f37b don't use OC_FilesystemView() 2013-02-10 14:17:18 +01:00
Tom Needham e63c4e3ea8 Change capabilities exposure for files_versions since it extends files 2013-02-10 12:41:27 +01:00
Tom Needham 5ad1b63f76 Fix api result merging. 2013-02-09 12:50:19 +00:00
Tom Needham 5d14a2cc46 Merge in master 2013-02-09 12:05:48 +00:00
Tom Needham 5102596e6d Add capabilities exposure to the versioning app 2013-02-09 11:53:54 +00:00
Thomas Müller 81792448ae Merge pull request #1472 from owncloud/files_versions-cleanup
files_versions cleanup
2013-02-06 08:53:20 -08:00
Bart Visscher 0e548283fc Replace OC_FileCache usage in files_versions 2013-02-06 08:00:57 +01:00
Bart Visscher 3e7ca373ec Only calculate md5 of local file once 2013-02-05 17:56:51 +01:00
Bart Visscher 148e4facfa Change files_versions namespace to OCA\Files_Versions 2013-02-05 17:46:39 +01:00
Robin Appelman 929b8c3e69 fix files_version hooks 2013-01-28 20:04:10 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Björn Schießle 73c4d0faff initialize $versionCreated 2013-01-16 10:20:09 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Björn Schießle 60d5d5f636 fix for issue #1186, missing variables added 2013-01-15 14:34:15 +01:00
Björn Schießle d276d21c76 - code clean-up
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Björn Schießle 99a0ea44ee function description fixed 2013-01-11 14:24:00 +01:00
Björn Schießle 67d00bc6bb some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed 2013-01-11 14:23:28 +01:00
Björn Schießle 6be9c0a974 some code clean-up 2013-01-11 11:12:32 +01:00
Björn Schießle dca0fda2ad keep track of the size of the versions directory 2013-01-10 18:04:30 +01:00
Björn Schießle 417498d519 add complete size of versions to array 2013-01-10 10:36:55 +01:00
Björn Schießle d51fba7781 every 1000s run reduce the number of versions for all files, not only for the currently edited file 2013-01-09 17:11:46 +01:00
Björn Schießle a0b0a1d294 adjust timestamp of the file copied from the version history 2013-01-07 15:13:32 +01:00
Björn Schießle 619c3ef56d use limits defined in issue https://github.com/owncloud/core/issues/860 2013-01-07 12:06:31 +01:00
Björn Schießle ec3c5f36cb debug output removed 2012-12-18 13:26:10 +01:00
Björn Schießle 21cdf93616 remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable 2012-12-18 12:57:28 +01:00
Björn Schießle e6e9d332cb add missing bracket 2012-12-18 12:37:24 +01:00
Björn Schießle 0e0d54dc58 get timestamp from file instead from time(); typo fixed 2012-12-17 18:00:11 +01:00
Björn Schießle 2a42344781 don't check for min interval, no longer needed 2012-12-17 17:14:24 +01:00
Björn Schießle 75a871ecd7 expire all operation no longer needed; delete oldest versions if limit of empty space is reached 2012-12-17 16:32:09 +01:00
Björn Schießle acc902a0b6 remove blacklist 2012-12-17 13:30:18 +01:00
Björn Schießle 0a49fcf9d1 update files history according the given intervals 2012-12-17 13:28:40 +01:00
Björn Schießle ee1ce6714b add size to versions array 2012-12-17 11:39:57 +01:00
Björn Schießle 24d4f701bf calculate free space for versions 2012-12-17 11:39:57 +01:00
Björn Schießle f66ebea5ca fix typo in variable name 2012-12-02 12:50:07 +01:00
Björn Schießle bafb78ac94 fix regression in file versioning for shared files 2012-12-02 12:46:07 +01:00
Robin Appelman 3358bface5 fix incorectly merged versions.php 2012-11-16 12:24:28 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +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
Björn Schießle 72aebe3aa3 fix broken paths in versions app 2012-10-27 18:08:00 +02:00
Björn Schießle f151376ad5 remove remaining line from merge conflict 2012-10-27 17:06:13 +02:00
Björn Schießle a93660d37a fix broken paths in versions app 2012-10-27 15:52:48 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Robin Appelman 77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Arthur Schiwon 5708488b3e make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs 2012-10-15 18:16:27 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Björn Schießle 33dcb3b1f4 fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively) 2012-10-10 11:49:16 +02:00
Bart Visscher 5f997021d1 Fix syntax bug 2012-09-19 21:29:16 +02:00
Bart Visscher ee32d1aad5 Fix versioning of shared files 2012-09-19 21:29:16 +02:00
Bart Visscher b04c7175dc Check if the versioned file exists before trying to do the versioning
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
Bart Visscher 10b74f9d05 Don't hide errors doing the versioning copy 2012-09-13 00:09:00 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 785aa751bb Whitespace fixes 2012-09-07 14:10:43 +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
jfd dc3bec6211 OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files 2012-08-25 03:13:59 +02:00
Robin Appelman 8a19e134df fix ununsed variables 2012-07-21 00:20:27 +02:00
Bjoern Schiessle e248412ca9 use getStorage() to get versions location
update routine implemented
version number of files_versions increased

Conflicts:

	apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
Bjoern Schiessle bf09bcc854 add OCP\Files to access files 2012-07-10 19:22:06 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Frank Karlitschek b967530795 increase the time limit again to a sensible granularity of 1 min.
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
Bjoern Schiessle 51774cca6b use OC_Filesystem for rollback 2012-07-05 14:20:40 +02:00
Bjoern Schiessle 55cde0e5aa moved remove and rename hook to libs/hooks.php 2012-07-05 11:35:08 +02:00
Sam Tuke b1c9785eb3 Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts:
	apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
Sam Tuke a775deaf22 Moved hooks and versions.php into new lib directory
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00