Commit Graph

417 Commits

Author SHA1 Message Date
Michael Gapczynski 7b2ec41477 Revert santizing toaddress, because PHPMailer now throws exceptions
Conflicts:
	apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
Michael Gapczynski ebcf5bce3c Sanitize toaddress for emailing private links
Conflicts:
	apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
Michael Gapczynski 91a15bae76 Revert santizing toaddress, because PHPMailer now throws exceptions 2012-07-11 16:02:43 -04:00
Michael Gapczynski 7077678f7f Sanitize toaddress for emailing private links 2012-07-11 15:26:22 -04:00
Michael Gapczynski 7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04: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
Lukas Reschke 04a0755fd3 CSRF checks 2012-07-07 16:03:21 +02:00
Michael Gapczynski 5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Michael Gapczynski eca2e073f8 Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -04:00
Michael Gapczynski bf93dd4661 Don't reload the page after sending private link to email address 2012-07-01 11:53:29 -04:00
Michael Gapczynski 2418d9a1a9 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Michael Gapczynski 895d5707ee Don't overwrite fake directory stream for Shared storage 2012-06-27 12:09:11 -04:00
Michael Gapczynski 2c773d549d Don't overwrite fake directory stream for Shared storage 2012-06-27 12:07:42 -04:00
Michael Gapczynski 28b7793d5b Fixes and change database table from sharing to share 2012-06-27 01:05:36 +02:00
Michael Gapczynski bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski 8198114615 Some more changes to getItems() and fixes in shared storage 2012-06-27 01:05:36 +02:00
Michael Gapczynski 71350bc618 I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api. 2012-06-27 01:05:36 +02:00
Michael Gapczynski 945565f420 Move ajax and js files to core 2012-06-27 01:05:36 +02:00
Sam Tuke 380f41136c Added placeholder msg to share with menu to clarify user list restricted to security context 2012-06-25 16:57:41 +01:00
Michael Gapczynski bf6abdde2d Add missing ')' 2012-06-21 12:26:06 -04:00
Sam Tuke a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
Sam Tuke d6bf62ea4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
Sam Tuke c244daac89 removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
Bart Visscher 6308ca6b8a Merge branch 'shared_log' 2012-06-20 17:20:46 +02:00
Bart Visscher 0086639891 Merge branch 'audit' 2012-06-20 17:20:39 +02:00
Bart Visscher 6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Sam Tuke 28a72e0e3c Fixed deleteAll function for deleting all old versions of files (expireAll)
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
Thomas Mueller a1364c9726 fixes oc-1026 2012-06-18 22:48:52 +02:00
Michael Gapczynski ec3033a5dd Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-15 19:34:25 -04:00
Robin Appelman 449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Michael Gapczynski f3b30e4658 Forgot $ sign for variable 2012-06-14 15:14:01 -04:00
Michael Gapczynski f7e686d4f1 Revert "Fix a counting mistake"
This reverts commit c20abfef38.
2012-06-14 15:05:20 -04:00
Arthur Schiwon b025ff8de3 reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:33:00 +02:00
Arthur Schiwon 12bfc551fb reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:31:38 +02:00
Michael Gapczynski 6e15b231b0 Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-14 12:27:30 -04:00
Bart Visscher 4510571aa1 Add app for logging access to shared files 2012-06-14 17:44:41 +02:00
Michael Gapczynski 7868b25dcc Fix incorrect creation of filesystem for user@group in data folder during shares 2012-06-12 21:34:35 -04:00
Michael Gapczynski 6f55a52858 Fix incorrect creation of filesystem for user@group in data folder during shares 2012-06-12 21:33:05 -04:00
Marco B 3be5e2af26 utf8 in der DB config 2012-06-11 23:04:28 +02:00
Arthur Schiwon 8c7fa15aaf Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:58:00 +02:00
Arthur Schiwon 4d3b7574f3 Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:55:16 +02:00
Frank Karlitschek d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +02:00
Frank Karlitschek 5d425a9f79 use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:16:44 +02:00
Frank Karlitschek c79a529edd remove not needed includes 2012-05-28 13:57:45 +02:00
Michael Gapczynski d8ca4f78cf Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:36:39 -04:00
Michael Gapczynski 970124a90b Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:35:29 -04:00
Frank Karlitschek 9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Michael Gapczynski b7aee58ef9 Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events 2012-05-17 21:26:55 -04:00
Michael Gapczynski fbe0d0d4fd Fix private links inside folders 2012-05-17 16:12:33 -04:00
Michael Gapczynski cf181e88bb Try to setup a user's filesystem if the user hasn't logged in before and is shared a file 2012-05-17 09:24:54 -04:00
Michael Gapczynski c04074692e Fix incorrect toaddress being passed for emailing private links 2012-05-15 19:05:26 -04:00
Michael Gapczynski b619821f4a Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs 2012-05-15 12:03:20 -04:00
Michael Gapczynski 7b92c27777 Check if a file is encrypted before sharing (encrypted files cannot be shared) 2012-05-15 11:29:02 -04:00
Michael Gapczynski a3b06e9658 Check if a private link points to a folder or file and change text accordingly 2012-05-14 20:21:31 -04:00
Michael Gapczynski cda9dcc7aa Fix private link emailing and clean up file name displayed in email 2012-05-14 20:21:31 -04:00
Michael Gapczynski 5cf42b88af Replace all %2F with a / in private link 2012-05-14 20:21:31 -04:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Michael Gapczynski d4271ed9df Use original source when resharing a file, fixes bug oc-210 2012-05-14 17:31:03 -04:00
Robin Appelman 6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +02:00
Robin Appelman e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Robin Appelman 0fb90fa875 set public handeler in info,xml for sharing 2012-05-14 00:28:27 +02:00
Michael Gapczynski b4e7c05959 Encoded slashes (%2F) don't look pretty in our private link urls 2012-05-11 20:58:21 -04:00
Michael Gapczynski faebee5f25 Turn async off when fetching users to make sure the users get removed from the select form 2012-05-11 20:39:48 -04:00
Michael Gapczynski daff3aa667 Prevent overwriting of private link status 2012-05-10 21:06:45 -04:00
Michael Gapczynski 60103d9b94 Only mount shared storage after a user has logged in, fixes shared folder not appearing for some WebDAV clients and sync client 2012-05-10 19:56:41 -04:00
Michael Gapczynski 3c6c8ecab0 Make email private link submit on enter as well 2012-05-10 11:44:06 -04:00
Michael Gapczynski 93c0e8b3bf Fix unsharing files also deleting private link, bug fix for oc-251 2012-05-09 17:38:35 -04:00
Michael Gapczynski 98cd98e2e5 Skip over users that have already been shared with when sharing with a group 2012-05-09 17:16:31 -04:00
Michael Gapczynski d4636f4b86 Fix renaming of shared files if target already exists, bug fix for oc-81 2012-05-09 17:01:46 -04:00
Michael Gapczynski 2e826fa82a Go back to updating mtime of shared folder to invoke a file cache rescan 2012-05-09 16:20:38 -04:00
Robin Appelman 3e57e76c48 fix creating the shared folder when the user home folder is not in the root mount 2012-05-09 20:36:08 +02:00
Michael Gapczynski 14b240a3f4 Still trying to fix some sharing use cases 2012-05-09 13:51:52 -04:00
Arthur Schiwon eb7e2d7d35 Sharing: even if a user has more groups in common, he should appear only once in the dropdown list 2012-05-09 11:35:36 +02:00
Michael Gapczynski f6df71b74d Set Content-Disposition to attachment for shared private links 2012-05-08 10:27:02 -04:00
Brice Maron 010b97febd Avoid touch operation when unshare public link 2012-05-07 22:37:18 +00:00
Michael Gapczynski bf8b3b0696 Forgot to set token variable 2012-05-07 12:36:29 -04:00
Michael Gapczynski e0a5f976e7 Fix bug oc-542, encode urls for private links 2012-05-07 11:30:36 -04:00
Michael Gapczynski 71423ec566 Fix bug oc-402, check if token is set for a private link 2012-05-07 10:47:55 -04:00
Michael Gapczynski b9033d3b78 Only load sharing statuses if in files app 2012-05-07 10:47:55 -04:00
Georg Ehrke 936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Bart Visscher 2d581c675f Audit: Log sharing actions 2012-05-07 09:04:07 +02:00
Michael Gapczynski 471cad7d90 Remove manual file cache insertions of shared files, update mtime of shared folder 2012-05-06 20:14:29 -04:00
Michael Gapczynski 41179a1456 Fix feedback for sharing errors 2012-05-06 19:06:24 -04:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Michael Gapczynski 565e02d061 Add back removed groups to the select form correctly 2012-05-05 17:10:07 -04:00
Michael Gapczynski ef9511c713 Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls 2012-05-05 15:18:14 -04:00
Michael Gapczynski d764585d8b Remove blind effect for email private link in drop down 2012-05-05 14:57:25 -04:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Michael Gapczynski 80dff77b65 Fix private links 2012-05-02 19:24:43 -04:00
Frank Karlitschek 4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek ff66600bc0 port appconfig 2012-05-02 14:11:29 +02:00
Thomas Müller 8ed8d9cd91 fixing namespace 2012-05-02 00:55:26 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek ab58471904 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-01 20:07:36 +02:00
Frank Karlitschek 1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Michael Gapczynski 20f3875f1b Change default from address to sharing-noreply@server for emailing private links 2012-05-01 13:06:17 -04:00
Frank Karlitschek 254b8b9506 porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Frank Karlitschek e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Georg Ehrke 7eb7492360 some fixes for sharing 2012-04-27 23:14:53 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Michael Gapczynski 754844f5c9 Add ability to send private links from sharing via email 2012-04-26 10:33:24 -04:00
Michael Gapczynski c20abfef38 Fix a counting mistake 2012-04-25 19:30:58 -04:00
Michael Gapczynski 32de47d1d9 Update sharing when users are removed, added to groups, and removed from groups 2012-04-25 18:18:58 -04:00
Michael Gapczynski 6895c54a3f Fix javascript checkbox toggle for resharing 2012-04-25 14:37:14 -04:00
Michael Gapczynski 7d9587bab3 Forgot to remove error log messages... 2012-04-25 11:54:16 -04:00
Michael Gapczynski b369adbd94 Allow admin to disable resharing of files 2012-04-25 11:51:30 -04:00
Georg Ehrke 42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Jan-Christoph Borchardt 3ba9a9e6a8 adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Jan-Christoph Borchardt 7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Robin Appelman 926b2b78fe keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00
Bart Visscher 5c55b9c5ac Sharing: Add a filename after public share link
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
Bart Visscher 524bd2e75f Sharing: Don't get share icon for undefined filename 2012-04-14 12:45:32 +02:00
Bart Visscher 7504ceb6f2 Sharing: Define missing template vars 2012-04-14 12:45:32 +02:00
Robin Appelman 523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Michael Gapczynski 5fef9dfc22 Make users only able to share with users in groups they belong to 2012-03-28 21:18:17 -04:00
Robin Appelman e76e4e7540 add touch() to all storage backands, and make parameter optional 2012-02-29 23:44:05 +01:00
Robin Appelman d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman 0af31a5328 missed one is_writeable 2012-02-26 03:56:45 +01:00
Robin Appelman c8c3b8a63e chunked implementation for readfile
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
Robin Appelman ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Marvin Thomas Rabe 7c738a1384 Sharing dropdown width fixed. 2012-02-23 22:28:13 +01:00
Robin Appelman 325858e9e2 add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper 2012-02-21 20:48:48 +01:00
Michael Gapczynski 87627c7a50 Fix overwriting of internal sharing for shared folders - bug oc-260 2012-02-18 19:30:54 -05:00
Michael Gapczynski 6f1ed85f0b Temporary fix for sharing files 2012-02-17 21:56:20 -05:00
Bart Visscher 525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Bart Visscher 88b2391d2b Fix wrong var name in sharedstorage.php 2012-02-08 21:12:31 +01:00
Robin Appelman 30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Robin Appelman 0124809a42 prevent sharing from making aditional http requests while scanning
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman 1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Michael Gapczynski e0f655fb70 Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113 2012-01-30 16:49:24 -05:00
Robin Appelman 4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Michael Gapczynski de16537231 Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file 2012-01-16 20:16:32 -05:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Michael Gapczynski 64a24191a3 Fix return for empty Shared folder in opendir() 2012-01-01 14:04:16 -05:00
Michael Gapczynski 9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Robin Appelman 65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
krzaczek 7454af0c79 apps files_sharing - fix in share.js to check the "can edit" checkbox -
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
krzaczek 82f30c709c apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
to enable other user backend
2011-11-18 14:05:38 +01:00