Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-07 16:45:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

disabled flag DIR_FLAGS_NETWORK_WIDE_GROUPS for consistency reasons. We might extend it to rsCircles later.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-11-06 20:46:56 +00:00
parent 65146b77d9
commit a2f958b956
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/dbase/fimonitor.cc
View file

@ -1448,6 +1448,7 @@ void FileIndexMonitor::locked_findShareFlagsAndParentGroups(FileEntry *file,File
{
flags = it->second.shareflags ;
flags &= PERMISSION_MASK ;
flags &= ~DIR_FLAGS_NETWORK_WIDE_GROUPS ; // Disabling this flag for now, because it has inconsistent effects.
parent_groups = it->second.parent_groups ;
}
#ifdef FIM_DEBUG2

1
libretroshare/src/ft/ftdbase.cc
View file

@ -345,6 +345,7 @@ bool ftFiMonitor::loadList(std::list<RsItem *>& load)
info.parent_groups = fi->parent_groups;
info.shareflags = FileStorageFlags(fi->flags) ;
info.shareflags &= PERMISSION_MASK ;
info.shareflags &= ~DIR_FLAGS_NETWORK_WIDE_GROUPS ; // disabling this flag for know, for consistency reasons
dirList.push_back(info) ;
}

2
libretroshare/src/rsserver/p3peers.cc
View file

@ -1127,7 +1127,7 @@ FileSearchFlags p3Peers::computePeerPermissionFlags(const std::string& peer_ssl_
found = true ;
}
bool network_wide = (share_flags & DIR_FLAGS_NETWORK_WIDE_OTHERS) || ( (share_flags & DIR_FLAGS_NETWORK_WIDE_GROUPS) && found) ;
bool network_wide = (share_flags & DIR_FLAGS_NETWORK_WIDE_OTHERS) ;//|| ( (share_flags & DIR_FLAGS_NETWORK_WIDE_GROUPS) && found) ;
bool browsable = (share_flags & DIR_FLAGS_BROWSABLE_OTHERS) || ( (share_flags & DIR_FLAGS_BROWSABLE_GROUPS) && found) ;
FileSearchFlags final_flags ;