]> source.dussan.org Git - nextcloud-server.git/commitdiff
Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax...
authorMichael Gapczynski <GapczynskiM@gmail.com>
Sat, 5 May 2012 18:56:52 +0000 (14:56 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Sat, 5 May 2012 19:18:14 +0000 (15:18 -0400)
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/getstatuses.php [new file with mode: 0644]
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/css/sharing.css
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php

index d9404f7e3b4113e35136c31309855f305c929699..6eed0408238c2b95b9cda84bed0d0000f291cf4a 100755 (executable)
@@ -1,36 +1,69 @@
 <?php
-//$RUNTIME_NOAPPS = true;
-
+require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
  
 OCP\JSON::checkAppEnabled('files_sharing');
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
+OCP\JSON::checkLoggedIn();
 
-$userDirectory = "/".OCP\USER::getUser()."/files";
-$source = $userDirectory.$_GET['source'];
+$item = array();
+$userDirectory = '/'.OCP\USER::getUser().'/files';
+$source = $userDirectory.$_GET['item'];
 $path = $source;
-$users = array();
-if ($users = OC_Share::getMySharedItem($source)) {
-       for ($i = 0; $i < count($users); $i++) {
-               if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-                       $users[$i]['token'] = OC_Share::getTokenFromSource($source);
-               }
-       }
-}
-$source = dirname($source);
-while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
-       if ($values = OC_Share::getMySharedItem($source)) {
-               $values = array_values($values);
-               $parentUsers = array();
-               for ($i = 0; $i < count($values); $i++) {
-                       if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-                               $values[$i]['token'] = OC_Share::getTokenFromSource($source)."&path=".substr($path, strlen($source));
+// Search for item and shared parent folders
+while ($path != $userDirectory) {
+       if ($rows = OC_Share::getMySharedItem($path)) {
+               for ($i = 0; $i < count($rows); $i++) {
+                       $uid_shared_with = $rows[$i]['uid_shared_with'];
+                       if ($uid_shared_with == OC_Share::PUBLICLINK && !isset($item['privateLink'])) {
+                               $token = OC_Share::getTokenFromSource($path);
+                               if ($path == $source) {
+                                       $item['privateLink'] = $token;
+                               } else {
+                                       // If in parent folder, include a path parameter to get direct access to file
+                                       $item['privateLink'] = $token.'&path='.substr($source, strlen($path));
+                               }
+                       } else {
+                               // Check if uid_shared_with is a group
+                               if (($pos = strpos($uid_shared_with, '@')) !== false) {
+                                       $gid = substr($uid_shared_with, $pos + 1);
+                                       // Include users in the group so the users can be removed from the list of people to share with
+                                       if ($path == $source) {
+                                               $group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false));
+                                       } else {
+                                               $group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => basename($path)));
+                                       }
+                                       if (!isset($item['groups'])) {
+                                               $item['groups'] = $group;
+                                       } else if (is_array($item['groups'])) {
+                                               $gidExists = false;
+                                               $currentGroups = $item['groups'];
+                                               // Check if the group is already included
+                                               foreach ($currentGroups as $g) {
+                                                       if ($g['gid'] == $gid) {
+                                                               $gidExists = true;
+                                                       }
+                                               }
+                                               if (!$gidExists) {
+                                                       $item['groups'] = array_merge($item['groups'], $group);
+                                               }
+                                       }
+                               } else {
+                                       if ($path == $source) {
+                                               $user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => false));
+                                       } else {
+                                               $user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => basename($path)));
+                                       }
+                                       if (!isset($item['users'])) {
+                                               $item['users'] = $user;
+                                       } else if (is_array($item['users'])) {
+                                               $item['users'] = array_merge($item['users'], $user);
+                                       }
+                               }
                        }
-                       $parentUsers[basename($source)."-".$i] = $values[$i];
                }
-               $users = array_merge($users, $parentUsers);
        }
-       $source = dirname($source);
-}
-if (!empty($users)) {
-       OCP\JSON::encodedPrint($users);
+       $path = dirname($path);
 }
+
+OCP\JSON::success(array('data' => $item));
+
+?>
diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php
new file mode 100644 (file)
index 0000000..c1892e7
--- /dev/null
@@ -0,0 +1,25 @@
+<?php
+require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
+
+OCP\JSON::checkAppEnabled('files_sharing');
+OCP\JSON::checkLoggedIn();
+
+$items = array();
+$userDirectory = '/'.OCP\USER::getUser().'/files';
+$dirLength = strlen($userDirectory);
+if ($rows = OC_Share::getMySharedItems()) {
+       for ($i = 0; $i < count($rows); $i++) {
+               $source = $rows[$i]['source'];
+               // Strip out user directory
+               $item = substr($source, $dirLength);
+               if ($rows[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
+                       $items[$item] = true;
+               } else {
+                       $items[$item] = false;
+               }
+       }
+}
+
+OCP\JSON::success(array('data' => $items));
+
+?>
\ No newline at end of file
index 73f59d73db2d49d9f79399705538c60404b8d1ca..2f4c5da978858a4187a39fbd5d0125368ad9cfa9 100755 (executable)
@@ -1,13 +1,14 @@
 <?php
-//$RUNTIME_NOAPPS = true;
+require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
+OCP\JSON::checkLoggedIn();
 
-$source = "/".OCP\USER::getUser()."/files".$_GET['source'];
-$uid_shared_with = $_GET['uid_shared_with'];
-$permissions = $_GET['permissions'];
+$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
+$uid_shared_with = $_POST['uid_shared_with'];
+$permissions = $_POST['permissions'];
 OC_Share::setPermissions($source, $uid_shared_with, $permissions);
 
+OCP\JSON::success();
+
 ?>
index 4863170f57cf6e18083c5d1d9a7f6870d58251fc..79ebf9187b9c727c723f479b71c8e8b24f1f20bb 100755 (executable)
@@ -1,31 +1,33 @@
 <?php
-//$RUNTIME_NOAPPS = true;
+require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
+OCP\JSON::checkLoggedIn();
 
-$userDirectory = "/".OCP\USER::getUser()."/files";
-$sources = explode(";", $_POST['sources']);
+$userDirectory = '/'.OCP\USER::getUser().'/files';
+$sources = explode(';', $_POST['sources']);
 $uid_shared_with = $_POST['uid_shared_with'];
 $permissions = $_POST['permissions'];
 foreach ($sources as $source) {
-       // Make sure file exists and can be shared
-       if ($source && OC_FILESYSTEM::file_exists($source) && OC_FILESYSTEM::is_readable($source)) {
-               $source = $userDirectory.$source;
-       // If the file doesn't exist, it may be shared with the current user
-       } else if (!$source = OC_Share::getSource($userDirectory.$source)) {
-               OCP\Util::writeLog('files_sharing',"Shared file doesn't exists :".$source,OCP\Util::ERROR);
-               echo "false";
-       }
-       try {
-               $shared = new OC_Share($source, $uid_shared_with, $permissions);
-               if ($uid_shared_with == OC_Share::PUBLICLINK) {
-                       echo $shared->getToken();
+       $path = ltrim($source, '/'); 
+       $source = $userDirectory.$source;
+       // Check if the file exists or if the file is being reshared
+       if ($source && (OC_FILESYSTEM::file_exists($path) && OC_FILESYSTEM::is_readable($path) || OC_Share::getSource($source))) {
+               try {
+                       $shared = new OC_Share($source, $uid_shared_with, $permissions);
+                       // If this is a private link, return the token
+                       if ($uid_shared_with == OC_Share::PUBLICLINK) {
+                               OCP\JSON::success(array('data' => $shared->getToken()));
+                       } else {
+                               OCP\JSON::success();
+                       }
+               } catch (Exception $exception) {
+                       OCP\Util::writeLog('files_sharing', 'Unexpected Error : '.$exception->getMessage(),OCP\Util::ERROR);
+                       OCP\JSON::error();
                }
-       } catch (Exception $exception) {
-               OCP\Util::writeLog('files_sharing',"Unexpected Error : ".$exception->getMessage(),OCP\Util::ERROR);
-               echo "false";
+       } else {
+               OCP\Util::writeLog('files_sharing', 'File does not exist or is not readable :'.$source,OCP\Util::ERROR);
+               OCP\JSON::error();
        }
 }
 
index 5056c59a3d45aa336ea3c547ebfd9de0f5394327..9088bf4266349c05093715fb85d556bb30b8e403 100755 (executable)
@@ -1,12 +1,13 @@
 <?php
-//$RUNTIME_NOAPPS = true;
+require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 OCP\JSON::checkAppEnabled('files_sharing');
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
+OCP\JSON::checkLoggedIn();
 
-$source = "/".OCP\USER::getUser()."/files".$_GET['source'];
-$uid_shared_with = $_GET['uid_shared_with'];
+$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
+$uid_shared_with = $_POST['uid_shared_with'];
 OC_Share::unshare($source, $uid_shared_with);
 
+OCP\JSON::success();
+
 ?>
index 73b5f126984dcd3251fb0fda9f42cdca2ba6bb38..99cc81bce04d15383b4b07ec72cac71febe92570 100755 (executable)
@@ -1,7 +1,4 @@
 <?php
-//$RUNTIME_NOAPPS = true;
-
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
@@ -14,12 +11,17 @@ $users[] = "<optgroup label='Users'>";
 $groups[] = "<optgroup label='Groups'>";
 foreach ($userGroups as $group) {
        $groupUsers = OC_Group::usersInGroup($group);
+       $userCount = 0;
        foreach ($groupUsers as $user) {
                if ($user != $self) {
                        $users[] = "<option value='".$user."'>".$user."</option>";
+                       $userCount++;
                }
        }
-       $groups[] = "<option value='".$group."'>".$group."</option>";
+       // Don't include the group if only the current user is a member of it
+       if ($userCount > 0) {
+               $groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
+       }
 }
 $users[] = "</optgroup>";
 $groups[] = "</optgroup>";
index 5acd9af589ad03a5461578783ad69865635dd28c..c4b4540e9d12fd52e7b7080b1c3ba33d01a96287 100644 (file)
@@ -6,8 +6,9 @@
 -moz-box-shadow:0 1px 1px #777; -webkit-box-shadow:0 1px 1px #777; box-shadow:0 1px 1px #777;
 -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em;
 -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
-#shared_list { padding:0.5em; list-style-type: none; }
-#public { border-top:1px solid #ddd; padding-top:0.5em; }
+#sharedWithList { padding:0.5em; list-style-type: none; }
+#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
 a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
 #share_with { width: 16em; }
+#privateLink label, .edit { font-weight:normal; }
index d9750761fc7afbe711d980a9edee4e50fb6d2694..65118f5e85c68146c24c4c77ec54cc486d4f2368 100644 (file)
+OC.Share={
+       icons:[],
+       itemUsers:[],
+       itemGroups:[],
+       itemPrivateLink:false,
+       usersAndGroups:[],
+       loadIcons:function() {
+               // Cache all icons for shared files
+               $.getJSON(OC.filePath('files_sharing', 'ajax', 'getstatuses.php'), function(result) {
+                       if (result && result.status === 'success') {
+                               $.each(result.data, function(item, hasPrivateLink) {
+                                       if (hasPrivateLink) {
+                                               OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
+                                       } else {
+                                               OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
+                                       }
+                               });
+                       }
+               });
+       },
+       loadItem:function(item) {
+               $.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'getitem.php'), data: { item: item }, async: false, success: function(result) {
+                       if (result && result.status === 'success') {
+                               var item = result.data;
+                               OC.Share.itemUsers = item.users;
+                               OC.Share.itemGroups = item.groups;
+                               OC.Share.itemPrivateLink = item.privateLink;
+                       }
+               }});
+       },
+       share:function(source, uid_shared_with, permissions, callback) {
+               $.post(OC.filePath('files_sharing', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+                       if (result && result.status === 'success') {
+                               if (callback) {
+                                       callback(result.data);
+                               }
+                       } else {
+                               OC.dialogs.alert('Error', 'Error while sharing');
+                       }
+               });
+       },
+       unshare:function(source, uid_shared_with, callback) {
+               $.post(OC.filePath('files_sharing', 'ajax', 'unshare.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
+                       if (result && result.status === 'success') {
+                               if (callback) {
+                                       callback();
+                               }
+                       } else {
+                               OC.dialogs.alert('Error', 'Error while unsharing');
+                       }
+               });
+       },
+       changePermissions:function(source, uid_shared_with, permissions) {
+               $.post(OC.filePath('files_sharing','ajax','setpermissions.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
+                       if (!result || result.status !== 'success') {
+                               OC.dialogs.alert('Error', 'Error while changing permissions');
+                       }
+               });
+       },
+       showDropDown:function(item, appendTo) {
+               OC.Share.loadItem(item);
+               var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
+               html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
+               html += '<option value=""></option>';
+               html += '</select>';
+               html += '<div id="sharedWithList">';
+               html += '<ul id="userList"></ul>';
+               html += '<div id="groups" style="display:none;">';
+               html += '<br />';
+               html += 'Groups: ';
+               html += '<ul id="groupList"></ul>';
+               html += '</div>';
+               html += '</div>';
+               html += '<div id="privateLink">';
+               html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
+               html += '<br />';
+               html += '<input id="privateLinkText" style="display:none; width:90%;" />';
+               html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
+               html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
+               html += '</div>';
+               $(html).appendTo(appendTo);
+               if (OC.Share.usersAndGroups.length < 1) {
+                       $.getJSON(OC.filePath('files_sharing', 'ajax', 'userautocomplete.php'), function(users) {
+                               if (users) {
+                                       OC.Share.usersAndGroups = users;
+                                       $.each(users, function(index, user) {
+                                               $(user).appendTo('#share_with');
+                                       });
+                                       $('#share_with').trigger('liszt:updated');
+                               }
+                       });
+               } else {
+                       $.each(OC.Share.usersAndGroups, function(index, user) {
+                               $(user).appendTo('#share_with');
+                       });
+                       $('#share_with').trigger('liszt:updated');
+               }
+               if (OC.Share.itemUsers) {
+                       $.each(OC.Share.itemUsers, function(index, user) {
+                               if (user.parentFolder) {
+                                       OC.Share.addSharedWith(user.uid, user.permissions, false, user.parentFolder);
+                               } else {
+                                       OC.Share.addSharedWith(user.uid, user.permissions, false, false);
+                               }
+                       });
+               }
+               if (OC.Share.itemGroups) {
+                       $.each(OC.Share.itemGroups, function(index, group) {
+                               if (group.parentFolder) {
+                                       OC.Share.addSharedWith(group.gid, group.permissions, group.users, group.parentFolder);
+                               } else {
+                                       OC.Share.addSharedWith(group.gid, group.permissions, group.users, false);
+                               }
+                       });
+               }
+               if (OC.Share.itemPrivateLink) {
+                       OC.Share.showPrivateLink(item, OC.Share.itemPrivateLink);
+               }
+               $('#dropdown').show('blind');
+               $('#share_with').chosen();
+       },
+       hideDropDown:function(callback) {
+               $('#dropdown').hide('blind', function() {
+                       $('#dropdown').remove();
+                       if (callback) {
+                               callback.call();
+                       }
+               });
+       },
+       addSharedWith:function(uid_shared_with, permissions, isGroup, parentFolder) {
+               if (parentFolder) {
+                       var sharedWith = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
+               } else {
+                       var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
+                       var style = ((permissions == 0) ? 'style="display:none;"' : '');
+                       var sharedWith = '<li data-uid_shared_with="'+uid_shared_with+'">';
+                       sharedWith += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
+                       sharedWith += uid_shared_with;
+                       sharedWith += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
+                       sharedWith += '<label class="edit" for="'+uid_shared_with+'" '+style+'>can edit</label>';
+                       sharedWith += '</li>';
+               }
+               if (isGroup) {
+                       // Groups are added to a different list
+                       $('#groups').show();
+                       $(sharedWith).appendTo('#groupList');
+                       // Remove group from select form
+                       $('#share_with option[value="'+uid_shared_with+'(group)"]').remove();
+                       $('#share_with').trigger('liszt:updated');
+                       // Remove users in group from select form
+                       $.each(isGroup, function(index, user) {
+                               $('#share_with option[value="'+user+'"]').remove();
+                               $('#share_with').trigger('liszt:updated');
+                       });
+               } else {
+                       $(sharedWith).appendTo('#userList');
+                       // Remove user from select form
+                       $('#share_with option[value="'+uid_shared_with+'"]').remove();
+                       $('#share_with').trigger('liszt:updated');
+               }
+               
+       },
+       removeSharedWith:function(uid_shared_with) {
+               $('#sharedWithList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
+               if ($('#groupList li').length < 1) {
+                       $('#groups').hide();
+               }
+               var option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
+               $(option).appendTo('#share_with');
+               $('#share_with').trigger('liszt:updated');
+       },
+       showPrivateLink:function(item, token) {
+               $('#privateLinkCheckbox').attr('checked', true);
+               var link = parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token;
+               if (token.indexOf('&path=') == -1) {
+                       link += '&file=' + item;
+               } else {
+                       // Disable checkbox if inside a shared parent folder
+                       $('#privateLinkCheckbox').attr('disabled', 'true');
+               }
+               $('#privateLinkText').val(link);
+               $('#privateLinkText').show('blind', function() {
+                       $('#privateLinkText').after('<br id="emailBreak" />');
+                       $('#email').show();
+                       $('#emailButton').show();
+               });
+       },
+       hidePrivateLink:function() {
+               $('#privateLinkText').hide('blind');
+               $('#emailBreak').remove();
+               $('#email').hide();
+               $('#emailButton').hide();
+       },
+       emailPrivateLink:function() {
+               $('#email').css('font-weight', 'bold');
+               $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+                       $(this).val('');
+               }).val('Email sent');
+               $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), 'toaddress='+$('#email').val()+'&link='+$('#link').val());
+       },
+       dirname:function(path) {
+               return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
+       }
+}
+
 $(document).ready(function() {
-       var shared_status = {};
+       OC.Share.loadIcons();
+
        if (typeof FileActions !== 'undefined') {
                FileActions.register('all', 'Share', function(filename) {
-                       if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-                       var icon;
-                       if (typeof filename == 'undefined') {
-                               return false;
-                       }
-                       var file = $('#dir').val()+'/'+filename;
-                       if(shared_status[file])
-                               return shared_status[file].icon;
-                       $.ajax({
-                               type: 'GET',
-                               url: OC.linkTo('files_sharing', 'ajax/getitem.php'),
-                               dataType: 'json',
-                               data: {source: file},
-                               async: false,
-                               success: function(users) {
-                                       if (users) {
-                                               icon = OC.imagePath('core', 'actions/shared');
-                                               $.each(users, function(index, row) {
-                                                       if (row.uid_shared_with == 'public') {
-                                                               icon = OC.imagePath('core', 'actions/public');
-                                                       }
-                                               });
-                                       } else {
-                                               icon = OC.imagePath('core', 'actions/share');
+                       // Return the correct sharing icon
+                       if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
+                       var item =  $('#dir').val() + '/' + filename;
+                       // Check if icon is in cache
+                       if (OC.Share.icons[item]) {
+                               return OC.Share.icons[item];
+                       } else {
+                               var last = '';
+                               var path = OC.Share.dirname(item);
+                               // Search for possible parent folders that are shared
+                               while (path != last) {
+                                       if (OC.Share.icons[path]) {
+                                               OC.Share.icons[item] = OC.Share.icons[path];
+                                               return OC.Share.icons[item];
                                        }
-                                       shared_status[file]= { timestamp: new Date().getTime(), icon: icon };
+                                       last = path;
+                                       path = OC.Share.dirname(path);
                                }
-                       });
-                       return icon;
+                               OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
+                               return OC.Share.icons[item];
+                       }
                }, function(filename) {
+                       var file = $('#dir').val() + '/' + filename;
+                       var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename');
+                       // Check if drop down is already visible for a different file
                        if (($('#dropdown').length > 0)) {
-                               $('#dropdown').hide('blind', function() {
-                                       var dropdownFile = $('#dropdown').data('file') 
-                                       var file = $('#dir').val()+'/'+filename;
-                                       $('#dropdown').remove();
-                                       $('tr').removeClass('mouseOver');
-                                       if (dropdownFile != file) {
-                                               createDropdown(filename, file);
-                                       }
-                               });
+                               if (file != $('#dropdown').data('item')) {
+                                       OC.Share.hideDropDown(function () {
+                                               $('tr').removeClass('mouseOver');
+                                               $('tr').filterAttr('data-file',filename).addClass('mouseOver');
+                                               OC.Share.showDropDown(file, appendTo);
+                                       });
+                               }
                        } else {
-                               createDropdown(filename, $('#dir').val()+'/'+filename);
+                               $('tr').filterAttr('data-file',filename).addClass('mouseOver');
+                               OC.Share.showDropDown(file, appendTo);
                        }
                });
        };
-
-       $('.share').click(function(event) {
-               event.preventDefault();
-               event.stopPropagation();
-               var filenames = getSelectedFiles('name');
-               var length = filenames.length;
-               var files = '';
-               for (var i = 0; i < length; i++) {
-                       files += $('#dir').val()+'/'+filenames[i]+';';
-               }
-               createDropdown(false, files);
-       });
        
        $(this).click(function(event) {
                if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
                        if ($('#dropdown').is(':visible')) {
-                               delete shared_status[$('#dropdown').data('file')]; //Remove File from icon cache
-                               $('#dropdown').hide('blind', function() {
-                                       $('#dropdown').remove();
+                               OC.Share.hideDropDown(function() {
                                        $('tr').removeClass('mouseOver');
                                });
                        }
                }
        });
-       
-       $('#share_with').live('change', function() {
-               var source = $('#dropdown').data('file');
-               var uid_shared_with = $(this).val();
-               var permissions = 0;
-               var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
-               $.ajax({
-                       type: 'POST',
-                       url: OC.linkTo('files_sharing','ajax/share.php'),
-                       cache: false,
-                       data: data,
-                       success: function(result) {
-                               if (result !== 'false') {
-                                       addUser(uid_shared_with, permissions, false);
-                               }
-                       }
-               });
-       });
-       
-       $('#shared_list > li').live('mouseenter', function(event) {
+
+       $('#sharedWithList li').live('mouseenter', function(event) {
+               // Show permissions and unshare button
                $(':hidden', this).show();
        });
        
-       $('#shared_list > li').live('mouseleave', function(event) {
+       $('#sharedWithList li').live('mouseleave', function(event) {
+               // Hide permissions and unshare button
                $('a', this).hide();
                if (!$('input:[type=checkbox]', this).is(':checked')) {
                        $('input:[type=checkbox]', this).hide();
@@ -102,161 +272,85 @@ $(document).ready(function() {
                }
        });
        
-       $('.permissions').live('change', function() {
-               var permissions = (this.checked) ? 1 : 0;
-               var source = $('#dropdown').data('file');
-               var uid_shared_with = $(this).parent().data('uid_shared_with');
-               var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
-               $.ajax({
-                       type: 'GET',
-                       url: OC.linkTo('files_sharing','ajax/setpermissions.php'),
-                       cache: false,
-                       data: data
+       $('#share_with').live('change', function() {
+               var item = $('#dropdown').data('item');
+               var uid_shared_with = $(this).val();
+               var pos = uid_shared_with.indexOf('(group)');
+               var isGroup = false;
+               if (pos != -1) {
+                       // Remove '(group)' from uid_shared_with
+                       uid_shared_with = uid_shared_with.substr(0, pos);
+                       isGroup = true;
+               }
+               OC.Share.share(item, uid_shared_with, 0, function() {
+                       if (isGroup) {
+                               // Reload item because we don't know which users are in the group
+                               OC.Share.loadItem(item);
+                               var users;
+                               $.each(OC.Share.itemGroups, function(index, group) {
+                                       if (group.gid == uid_shared_with) {
+                                               users = group.users;
+                                       }
+                               });
+                               OC.Share.addSharedWith(uid_shared_with, 0, users, false);
+                       } else {
+                               OC.Share.addSharedWith(uid_shared_with, 0, false, false);
+                       }
+                       // Change icon
+                       if (!OC.Share.itemPrivateLink) {
+                               OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
+                       }
                });
        });
-
-       $('.unshare').live('click', function(event) {
-               event.preventDefault();
-               var user = $(this).parent();
-               var source = $('#dropdown').data('file');
-               var uid_shared_with = user.data('uid_shared_with');
-               var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
-               $.ajax({
-                       type: 'GET',
-                       url: OC.linkTo('files_sharing','ajax/unshare.php'),
-                       cache: false,
-                       data: data,
-                       success: function() {
-                               var option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
-                               $(user).remove();
-                               $(option).appendTo('#share_with');
-                               $('#share_with').trigger('liszt:updated');
+       
+       $('.unshare').live('click', function() {
+               var item = $('#dropdown').data('item');
+               var uid_shared_with = $(this).parent().data('uid_shared_with');
+               OC.Share.unshare(item, uid_shared_with, function() {
+                       OC.Share.removeSharedWith(uid_shared_with);
+                       // Reload item to update cached users and groups for the icon check
+                       OC.Share.loadItem(item);
+                       // Change icon
+                       if (!OC.Share.itemPrivateLink && !OC.Share.itemUsers && !OC.Share.itemGroups) {
+                               OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
                        }
                });
        });
        
-       $('#makelink').live('change', function() {
+       $('.permissions').live('change', function() {
+               var permissions = (this.checked) ? 1 : 0;
+               OC.Share.changePermissions($('#dropdown').data('item'), $(this).parent().data('uid_shared_with'), permissions);
+       });
+       
+       $('#privateLinkCheckbox').live('change', function() {
+               var item = $('#dropdown').data('item');
                if (this.checked) {
-                       var source = $('#dropdown').data('file');
-                       var uid_shared_with = 'public';
-                       var permissions = 0;
-                       var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
-                       $.ajax({
-                               type: 'POST',
-                               url: OC.linkTo('files_sharing','ajax/share.php'),
-                               cache: false,
-                               data: data,
-                               success: function(token) {
-                                       if (token) {
-                                               showPublicLink(token, source.substr(source.lastIndexOf('/')));
-                                       }
-                               }
+                       // Create a private link
+                       OC.Share.share(item, 'public', 0, function(token) {
+                               OC.Share.showPrivateLink(item, token);
+                               // Change icon
+                               OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
                        });
                } else {
-                       var source = $('#dropdown').data('file');
-                       var uid_shared_with = 'public';
-                       var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
-                       $.ajax({
-                               type: 'GET',
-                               url: OC.linkTo('files_sharing','ajax/unshare.php'),
-                               cache: false,
-                               data: data,
-                               success: function(){
-                                       $('#link').hide('blind');
-                                       $('#emailBreak').remove();
-                                       $('#email').hide();
-                                       $('#emailButton').hide();
+                       // Delete private link
+                       OC.Share.unshare(item, 'public', function() {
+                               OC.Share.hidePrivateLink();
+                               // Change icon
+                               if (OC.Share.itemUsers || OC.Share.itemGroups) {
+                                       OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
+                               } else {
+                                       OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
                                }
                        });
                }
        });
        
-       $('#link').live('click', function() {
+       $('#privateLinkText').live('click', function() {
                $(this).focus();
                $(this).select();
        });
 
        $('#emailButton').live('click', function() {
-               $('#email').css('font-weight', 'bold');
-               $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-                       $(this).val('');
-               }).val('Email sent');
-               $.post(OC.filePath('files_sharing','ajax','email.php'), 'toaddress='+$('#email').val()+'&link='+$('#link').val());
+               OC.Share.emailPrivateLink();
        });
-});
-
-function createDropdown(filename, files) {
-       var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
-       html += '<div id="private">';
-       html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
-       html += '<option value=""></option>';
-       html += '</select>';
-       html += '<ul id="shared_list"></ul>';
-       html += '</div>';
-       html += '<div id="public">';
-       html += '<input type="checkbox" name="makelink" id="makelink" value="1" /><label for="makelink">Share with private link</label>';
-       //html += '<input type="checkbox" name="public_link_write" id="public_link_write" value="1" /><label for="public_link_write">allow upload</label>';
-       html += '<br />';
-       html += '<input id="link" style="display:none; width:90%;" />';
-       html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
-       html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
-       html += '</div>';
-       if (filename) {
-               $('tr').filterAttr('data-file',filename).addClass('mouseOver');
-               $(html).appendTo($('tr').filterAttr('data-file',filename).find('td.filename'));
-       } else {
-               $(html).appendTo($('thead .share'));
-       }
-       $.getJSON(OC.linkTo('files_sharing', 'ajax/userautocomplete.php'), function(users) {
-               if (users) {
-                       $.each(users, function(index, row) {
-                               $(row).appendTo('#share_with');
-                       });
-                       $('#share_with').trigger('liszt:updated');
-               }
-       });
-       $.getJSON(OC.linkTo('files_sharing', 'ajax/getitem.php'), { source: files }, function(users) {
-               if (users) {
-                       $.each(users, function(index, row) {
-                               if (row.uid_shared_with == 'public') {
-                                       showPublicLink(row.token, '/'+filename);
-                               } else if (isNaN(index)) {
-                                       addUser(row.uid_shared_with, row.permissions, index.substr(0, index.lastIndexOf('-')));
-                               } else {
-                                       addUser(row.uid_shared_with, row.permissions, false);
-                               }
-                       });
-               }
-       });
-       $('#dropdown').show('blind');
-       $('#share_with').chosen();
-}
-
-function addUser(uid_shared_with, permissions, parentFolder) {
-       if (parentFolder) {
-               var user = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
-       } else {
-               var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-               var style = ((permissions == 0) ? 'style="display:none;"' : '');
-               var user = '<li data-uid_shared_with="'+uid_shared_with+'">';
-               user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
-               user += uid_shared_with;
-               user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
-               user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
-               user += '</li>';
-       }
-       $('#share_with option[value="'+uid_shared_with+'"]').remove();
-       $('#share_with').trigger('liszt:updated');
-       $(user).appendTo('#shared_list');
-}
-
-function showPublicLink(token, file) {
-       $('#makelink').attr('checked', true);
-       $('#link').data('token', token);
-       $('#link').val(parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token+'&f='+file);
-       $('#link').show('blind', function() {
-               $('#link').after('<br id="emailBreak" />');
-               $('#email').show();
-               $('#emailButton').show();
-       });
-}
+});
\ No newline at end of file
index 71cca3097764c1f2f015bb43b14ce0bf246c6aaa..d5cf3d0a1bab5b89d7e59dfc57da1f8c389f8a5c 100755 (executable)
@@ -69,7 +69,7 @@ class OC_Share {
                        }
                        foreach ($uid_shared_with as $uid) {
                                // Check if this item is already shared with the user
-                               $checkSource = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with ".self::getUsersAndGroups($uid));
+                               $checkSource = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with ".self::getUsersAndGroups($uid, false));
                                $resultCheckSource = $checkSource->execute(array($source))->fetchAll();
                                // TODO Check if the source is inside a folder
                                if (count($resultCheckSource) > 0 && !isset($gid)) {
@@ -125,7 +125,7 @@ class OC_Share {
        * @param $uid (Optional) The uid to get the user groups for, a gid to get the users in a group, or if not set the current user
        * @return An IN operator as a string
        */
-       private static function getUsersAndGroups($uid = null) {
+       private static function getUsersAndGroups($uid = null, $includePrivateLinks = true) {
                $in = " IN(";
                if (isset($uid) && OC_Group::groupExists($uid)) {
                        $users = OC_Group::usersInGroup($uid);
@@ -152,7 +152,9 @@ class OC_Share {
                                $in .= ", '".$uid."@".$group."'";
                        }
                }
-               $in .= ", '".self::PUBLICLINK."'";
+               if ($includePrivateLinks) {
+                       $in .= ", '".self::PUBLICLINK."'";
+               }
                $in .= ")";
                return $in;
        }