f4ecf47e61
Fixed delete cross positioning issue.
2011-09-27 05:26:49 +10:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
d928cd3636
files: hide non functioning code when called from a/f_s/get.php
...
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.
The actions div contains undefined variables and doesn't work either.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:54 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
8c8490b28e
Show users shared with in the drop down for reshared files
2011-08-24 18:41:36 -04:00
365c4fdae2
Allow sharing of files shared with you - Bug: Doesn't show up as being shared in the drop down
2011-08-24 12:32:02 -04:00
4c4b1e4c2d
Clear the folder size cache for the 'Shared' folder when a new item is shared
2011-08-24 11:59:03 -04:00
96ad8a15b4
Register OC_Share for autoloading and cleanup hooks
2011-08-22 12:37:44 -04:00
c72187474a
Check that the files exist before adding them to the fakedirs
2011-08-22 12:00:56 -04:00
1b64b7395c
Update documentation for unshareFromMySelf()
2011-08-22 11:31:47 -04:00
0eda75a193
One more bug fix in clearFolderSizeCache()
2011-08-20 15:48:48 -04:00
f10f916f8c
Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes
2011-08-20 15:43:18 -04:00
ceae4fa7b4
Fix bugs preventing file upload in shared folders with write permission
2011-08-20 12:36:20 -04:00
6afc17be1a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-20 12:03:22 -04:00
631152fc3e
Implement searching of files shared with you
2011-08-20 12:03:03 -04:00
d15673f13f
removed single quotes around publicly linked download file
2011-08-20 17:44:28 +02:00
add0a90e1e
single quotes in JavaScript & PHP, double quotes in HTML
2011-08-20 05:56:04 +02:00
c2f0fe51c4
Add getLocalFile() to OC_Filestorage_Shared
2011-08-19 20:05:57 -04:00
778b8543c1
Remove no longer needed functions in OC_Filestorage_Shared
2011-08-19 20:04:35 -04:00
ca86093270
Full support for viewing public links from sharing drop down
2011-08-19 12:47:00 -04:00
a57d4726bc
Remove some scripts, now you can actually download the files in a public link folder
2011-08-18 19:44:00 -04:00
d1aebcddf2
Add downloadURL to files templates for both public links and files
2011-08-18 19:32:24 -04:00
498356fcb8
Copy get.php into files_sharing, public links now use files templates
2011-08-18 15:35:31 -04:00
594532da9a
Merge public link icon check
2011-08-18 13:14:06 -04:00
8fb75f379a
Comment rename() and prevent trying to move items if the user doesn't have write permission
2011-08-17 22:10:25 -04:00
b4cf61ee32
Bug fixes for mkdir(), renaming/moving support for files inside a shared folder with write permission
2011-08-17 21:58:53 -04:00
4078e0a242
-1 is now a class constant (UNSHARED), for unsharing files from self
2011-08-17 18:00:37 -04:00
1303e40b6e
Remove navigation entry for shared files
2011-08-17 17:44:10 -04:00
5b8658ca10
New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self
2011-08-17 17:43:15 -04:00
1c13b2681a
Fix my last commit 9ee4fc
2011-08-17 14:22:14 -04:00
9ee4fcdf2f
Only show 'Shared' directory if files are shared with you
2011-08-17 13:47:10 -04:00
5925697374
Fix bug in getPermissions() and clean-up unlink() and rename()
2011-08-17 12:58:09 -04:00
b7b3a49203
Functions to get the token of a public link now stored by OC_Share, remove no longer needed ajax call to getlink.php
2011-08-16 21:32:51 -04:00
0edce1796b
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-16 20:21:57 -04:00
582dca4d91
Initial merging of files_sharing and files_publiclink
2011-08-16 20:21:18 -04:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
717ab56419
Display public icon next to publicly shared files
2011-08-16 12:18:31 -04:00
726933831d
Public link folder uploading not implemented, comment out checkbox for it in dropdown
2011-08-16 12:06:08 -04:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
5b09aef166
Additional user group sharing support and more clean-up in the constructor
2011-08-15 17:37:16 -04:00
5cb687d168
Refactor getUserAndGroups() for new user group sharing standard - user@group
2011-08-14 12:16:14 -04:00
e1473cfe83
Change OC_GROUP to OC_Group
2011-08-14 11:44:37 -04:00
3c517499bb
OC_Share constructor refactored for user group sharing
2011-08-12 20:49:44 -04:00
497789cdd8
Clean up constructor for OC_Share, add some error handling for sharing files
2011-08-12 17:22:32 -04:00
a8e6be6016
Change the share file action icon if the file is already shared with someone
2011-08-12 11:34:17 -04:00
9e35d5a886
Remove hardcoded http:// when generating public links
2011-08-11 16:56:09 -04:00
c65046773d
Make unshare work from dropdown
2011-08-11 14:20:50 -04:00
6d25943f2f
Fix some areas on dropdown triggering the dropdown to hide
2011-08-11 12:50:29 -04:00
0ad0ed77c5
Hide the dropdown if you click the share file action button
2011-08-11 12:03:48 -04:00
0f91438b80
Don't spawn a new dropdown if there is already one open
2011-08-11 11:52:10 -04:00
2af0269eb9
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
...
Conflicts:
apps/files_sharing/js/share.js
2011-08-11 11:15:17 -04:00
103d23b3a3
Refactoring in dropdown javascript
2011-08-11 11:09:14 -04:00
568fd0df83
changed quotes
2011-08-11 13:53:25 +02:00
511c193631
only load share action when in file browser
2011-08-11 13:33:43 +02:00
80660bdc07
Fix shared list for files inside of shared folders
2011-08-10 13:38:58 -04:00
88e338ec23
Only show can edit (if not checked) and unshare button on hover
2011-08-09 17:55:51 -04:00
7c840e9bbb
Remove users and groups from the select form that have already been shared with
2011-08-09 11:00:14 -04:00
c654442901
No more subnavigation entries, fixing 'Shared'
2011-08-09 10:45:12 -04:00
cdf2dbcd52
Use chosen select form for selecting users in sharing drop down
2011-08-09 10:34:00 -04:00
23c8d7b3fb
Show which parent folder is shared with the user in the sharing drop down
2011-08-08 15:49:16 -04:00
5d521d7c7c
Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions
2011-08-07 15:20:57 -04:00
843f8aca7c
Full support for making and deleting public links from share dropdown
2011-08-05 11:18:35 -04:00
8f01abf054
Share dropdown updates, making public links now works
2011-08-03 15:21:53 -04:00
96ab35a331
Animate appearance of share drop down
2011-08-02 15:23:17 -04:00
d0b2a3b1ac
moved dialog css to sharing, fixed position
2011-08-02 19:30:18 +02:00
d71cca0e81
first style for sharing dropdown, some html fixes
2011-08-02 18:58:33 +02:00
0d79560e94
New implementation of share dialog
2011-08-02 12:19:49 -04:00
ddfc9fc001
Move registering shared storage out of base
2011-08-01 10:58:15 -04:00
57ca70e27c
Add support for assigning permissions in share dialog and switch to post
2011-07-31 20:47:53 -04:00
a14a83b9c6
Fix delTree(), it shouldn't be passed to the local storage provider unless the user has delete permission
2011-07-31 15:02:59 -04:00
c185743ae9
Update the folder sizes for shared folders
2011-07-31 14:48:23 -04:00
f88c4b1f48
Human readable permissions in shared files list
2011-07-31 13:15:07 -04:00
11d1627513
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
...
Conflicts:
lib/base.php
2011-07-30 19:40:19 -04:00
d13ba0ee2d
Revise permissions system to support read, write, and delete
2011-07-30 16:03:32 -04:00
09e05d14a0
im in ur branch, fixin teh details
2011-07-30 14:40:10 +02:00
f0c1f38f98
Add share action for mutliple selected files
2011-07-29 15:43:29 -04:00
45222f34a6
Make 'Share' a subnavigation entry of of 'Files'
2011-07-29 12:20:01 -04:00
1fc41a7bfc
Integrate sharing app with the new interface
2011-07-29 12:11:53 -04:00
67fe835f03
Add a function for removing any duplicate or trailing '/' from the paths
2011-07-28 20:28:22 -04:00
7e3b796de8
More elegant solution for preparing IN ?s, thanks icewind
2011-07-28 20:05:18 -04:00
5bc0619234
Add support for sharing files with user groups
2011-07-28 19:42:02 -04:00
31a067b5a3
Add support for sharing multiple files from share dialog, move loops outside of OC_SHARE
2011-07-28 15:31:52 -04:00
d36850f0f2
Close sharing dialog box on share success
2011-07-27 19:52:10 -04:00
64b5332f33
Make file sharing dialog work - only works for one file/folder and user
2011-07-27 19:25:33 -04:00
1ec0b6ecc1
jQuery dialog for sharing files from within file browser - Not functional yet
2011-07-26 21:27:40 -04:00
5148eb9121
Include groups in user autocomplete
2011-07-24 16:07:39 -04:00
4282a42b3f
Add support for user autocomplete
2011-07-24 15:47:37 -04:00
17b5bcb24f
Bug fixes for unshare() and opendir(), thanks darkh
2011-07-24 14:38:01 -04:00
4993fb4665
Filter out files you unshare from yourself in opendir()
2011-07-23 14:41:01 -04:00
e6e673d7c0
Use SUBSTR instead of LIKE in queries, should now work with SQLite
2011-07-22 20:41:16 -04:00
302527c2d6
Remove shared items check, it prevents sharing items if there aren't already any.
2011-07-21 14:53:51 -04:00
4abefde290
Remove admin page, administration is not needed at this time for sharing
2011-07-20 16:54:06 -04:00
6af4c465b8
Change all occurences of ['user_id'] to OC_USER::getUser()
2011-07-20 16:52:01 -04:00
fcda3a338c
Fix bug in constructor for appending numbers to already existing targets
2011-07-20 16:41:39 -04:00
3e6037659e
Change permissions to is_writeable
2011-07-20 15:42:49 -04:00
22f8415045
Remove accidental kate swap file
2011-07-20 14:46:01 -04:00
1cfa911ce3
Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider
2011-07-20 14:42:48 -04:00
c9082d5b0d
Append number to name if target file already exists
2011-07-20 14:16:20 -04:00
029b21bf54
First implementation of sharing user interface
2011-07-20 13:34:16 -04:00
61837428ba
Add post_delete and post_rename hooks and fix the constructor
2011-07-18 16:36:34 -04:00
1a6718c979
Add extra check for opendir() so it only adds the file to fakedirs if it has a different name than the source
2011-07-16 15:15:18 -04:00
f3f8a96c6d
Add return true to unlink() and rename(), a return is expected by OC_FILESYSTEM
2011-07-16 14:58:12 -04:00
5aaacf3241
Fix bug in rename() so files in a folder that is in a shared folder also get their targets updated
2011-07-16 14:29:22 -04:00
dbcb35655e
Fix bugs in opendir() and add extra checks to ensure functionality in all cases
2011-07-16 14:24:59 -04:00
8ad4a44171
Fix bugs in unlink(), rename(), pullOutOfFolders(), and getItemsInFolder()
2011-07-16 13:06:59 -04:00
8ed0223bd6
Add pullOutOfFolder() function for use by unlink() and rename()
2011-07-14 21:04:09 -04:00
7920e706ea
Refactoring of OC_SHARE, added more documentation for functions
2011-07-14 19:24:48 -04:00
2fb1481613
Bug fix for setTarget() - append fetchAll() to query
2011-07-14 12:40:12 -04:00
24e24f1b65
Add support for copying files between shared folders, add check to fromTmpFile() to confirm path is writeable
2011-07-13 15:27:16 -04:00
d393ccfe2c
Fix bug in getSource(), return false if target isn't in database
2011-07-12 20:18:08 -04:00
b2b7d99302
Add checks in opendir() to prevent including the current directory or parent
2011-07-12 18:22:59 -04:00
6b303ee64b
Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead
2011-07-12 13:10:29 -04:00
163c490c92
Remove duplicate '/' from target when searching for source
2011-07-10 14:41:27 -04:00
010920ad08
Add support for files inside of shared folders having different names than the source file
2011-07-08 18:21:20 -04:00
73bab46758
Prevent searching for user directory in getParentFolders()
2011-07-08 15:23:41 -04:00
f1cac00396
Add wildcard to source for database query in unshare()
2011-07-08 15:03:05 -04:00
d91d2178b8
Fix unshare() to remove database entries of files within a shared folder
2011-07-08 14:58:35 -04:00
35d6051e9d
Fix bug in mkdir(), was passing the wrong path
2011-07-07 19:26:25 -04:00
b7c45ba240
mkdir() now checks isWriteable() to see if it has permission, rmdir unshares the folder from the user
2011-07-07 19:22:23 -04:00
58e8312b1c
Fix setIsWriteable() and setTarget()
2011-07-07 18:25:34 -04:00
2212b5b5d7
Add wildcard to database query in unshareFromSelf()
2011-07-06 20:16:29 -04:00
2908145b94
Fix bug in is_writeable(), was passing the wrong path
2011-07-06 15:28:50 -04:00
732ad7f6c1
Add support for renaming, moving, and deleting shared files
2011-07-06 15:17:03 -04:00
cf33995892
Refactor OC_SHARE to allow for renaming and write permissions
2011-07-06 12:12:29 -04:00
9deab8302f
Fix bugs in getSource() and implement new target path standard
2011-07-05 11:56:02 -04:00
e24e2d0e16
Append LIMIT 1 to getSource queries to improve performance
2011-07-03 11:43:49 -04:00
b03083b881
Fix check for parentDir and fix the return for a nonexistent target in the database
2011-06-27 18:14:04 -04:00
053edde780
Improvements to caching for shared folders
2011-06-27 12:53:10 -04:00
a402c8ffe1
Implement caching for source paths in OC_FILESTORAGE_SHARED
2011-06-27 11:47:36 -04:00
fe178310f3
Use php functions dirname() and basename() instead of manipulating strings in getSource()
2011-06-26 19:21:24 -04:00
12c168b6dd
Add function setTarget(), implement recursion in getSource() for folders
2011-06-25 22:00:52 -04:00
78293ea244
Better implementation of getting shared folder size by using the source path
2011-06-24 19:52:35 -04:00
c8781b1caf
Add error handling for getSource()
2011-06-24 19:38:39 -04:00
e91f42d249
Add support for sharing folders
2011-06-24 19:20:08 -04:00
8cbee28416
Better implementation of filesize for shared directory, now storing in oc_foldersize
2011-06-22 21:05:31 -04:00
87097db4eb
Changed self:: and OC_FILESTORAGE_SHARED to ->
2011-06-22 19:47:57 -04:00
e3ea84d048
Changed ctime for the shared folder to the earliest ctime
2011-06-22 19:17:31 -04:00
3f5fde50c1
Forgot to remove TODOs for file?time()s
2011-06-22 18:22:48 -04:00
098fc5ef95
Fixed stat(), file?time()'s now grab most recent time from shared files
2011-06-22 18:16:41 -04:00
ac0d41418e
Correct calculation for shared folder size
2011-06-22 17:55:07 -04:00
18e776fa2f
Changed mount point to 'Share', fixed is_dir()
2011-06-22 11:40:09 -04:00
4e7d1c376f
OC_FILESTOAGE_SHARED now works with hard coded values for files
2011-06-18 13:49:52 -04:00
69b5e01be1
OC_FILESTOAGE_SHARED updates + its own getInternalPath()
2011-06-18 13:29:16 -04:00
e6621b9c78
Added source and target to database fields
2011-06-16 15:54:25 -04:00
fe4a213e1b
Fixed mistakes pointed out by icewind
2011-06-16 14:59:54 -04:00
bf66563cda
First version of shared storage provider - not functional
2011-06-16 14:40:21 -04:00
8603b0973f
Initial setup of sharing app
2011-06-11 16:14:24 -04:00
Scott Barnett
Bart Visscher
Florian Pritz
Bart Visscher
Michael Gapczynski
Jan-Christoph Borchardt
Robin Appelman