mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 21:35:13 +00:00
rename collections to privacy groups
This commit is contained in:
redmatrix
parent
202817740a
commit
d83b907cdc
16 changed files with 500 additions and 495 deletions
3
boot.php
3
boot.php
|
|
@ -575,6 +575,9 @@ define ( 'ITEM_TYPE_WEBPAGE', 3 );
|
|||
define ( 'ITEM_TYPE_BUG', 4 );
|
||||
define ( 'ITEM_TYPE_DOC', 5 );
|
||||
|
||||
define ( 'ITEM_IS_STICKY', 1000 );
|
||||
|
||||
|
||||
define ( 'DBTYPE_MYSQL', 0 );
|
||||
define ( 'DBTYPE_POSTGRES', 1 );
|
||||
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ Private messages are encrypted during transport and storage. In this day and age
|
|||
|
||||
This provides the ability to select posts by date ranges
|
||||
|
||||
**Collections Filter**
|
||||
**Privacy Group Filter**
|
||||
|
||||
Enable widget to display stream posts only from selected collections. This also toggles the outbound permissions while you are viewing a collection. This is analogous to Google "circles" or Disapora "aspects".
|
||||
Enable widget to display stream posts only from selected groups of connection. This also toggles the outbound permissions while you are viewing a privacy group. This is analogous to Google "circles" or Disapora "aspects".
|
||||
|
||||
**Saved Searches**
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ When you start to mention somebody, it will create an auto-complete box to selec
|
|||
|
||||
**Private Mentions**
|
||||
|
||||
If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or collections from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to include them (and perhaps restrict the post from "everybody" if this was the default). You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda (in addition to any recipients you selected with the privacy selector - if any).
|
||||
If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to include them (and perhaps restrict the post from "everybody" if this was the default). You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda (in addition to any recipients you selected with the privacy selector - if any).
|
||||
|
||||
You may also tag public collections. When you create or edit a collection, there is a checkbox to allow the group members to be seen by others. If this box is checked for a collection and you tag (for instance) @!Friends - the post will be restricted to the Friends collection. Check that the collection is public before doing this - as there is no way to take back a post except to delete it. The collection name will appear in the post and will alert members of that collection that they are members of it.
|
||||
You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Some/many of these widgets have restrictions which may restrict the type of page
|
|||
* args: count - number of items to return (default 24)
|
||||
<br /> <br />
|
||||
|
||||
* collections - collection selector for the current logged in channel
|
||||
* collections - privacy group selector for the current logged in channel
|
||||
|
||||
* args: mode - one of "conversation", "group", "abook" depending on module
|
||||
<br /> <br />
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
|
|||
|
||||
[b]Permissions[/b]
|
||||
|
||||
When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit "filestorage/{{username}}"; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate collections of channels.
|
||||
When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit "filestorage/{{username}}"; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate privacy groups.
|
||||
|
||||
#include doc/macros/main_footer.bb;
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ Private messages are encrypted during transport and storage. In this day and age
|
|||
|
||||
This provides the ability to select posts by date ranges
|
||||
|
||||
[b]Collections Filter[/b]
|
||||
[b]Privacy Group Filter[/b]
|
||||
|
||||
Enable widget to display stream posts only from selected collections. This also toggles the outbound permissions while you are viewing a collection. This is analogous to Google "circles" or Disapora "aspects".
|
||||
Enable widget to display stream posts only from selected privacy groups. This also toggles the outbound permissions while you are viewing a group. This is analogous to Google "circles" or Disapora "aspects".
|
||||
|
||||
[b]Saved Searches[/b]
|
||||
|
||||
|
|
|
|||
|
|
@ -106,9 +106,9 @@ There is also experimental support for OpenID authentication which may be used i
|
|||
|
||||
Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel.
|
||||
|
||||
[b]Collections[/b]
|
||||
[b]Privacy Groups[/b]
|
||||
|
||||
"Collections" is our implementation of privacy groups, which is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by collections or groups, and automatically set the outbound Access Control List to only those in the Collection when you post. You may over-ride this at any time (prior to sending the post).
|
||||
Our implementation of privacy groups is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by selected groups, and automatically set the outbound Access Control List to only those in that privacy group when you post. You may over-ride this at any time (prior to sending the post).
|
||||
|
||||
|
||||
[b]Directory Services[/b]
|
||||
|
|
|
|||
10
doc/roles.md
10
doc/roles.md
|
|
@ -11,11 +11,11 @@ The channel is a typical social networking profile. By default posts and publish
|
|||
|
||||
**Restricted**
|
||||
|
||||
By default all posts and published items are sent to your 'Friends' collection and not made public. New friends are added to this collection. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
|
||||
By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
|
||||
|
||||
**Private**
|
||||
|
||||
By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
|
||||
By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
|
||||
|
||||
|
||||
##Forum
|
||||
|
|
@ -27,11 +27,11 @@ The channel is a typical forum. By default posts and published items are public.
|
|||
|
||||
**Restricted**
|
||||
|
||||
By default all posts and published items are sent to the channel's 'Friends' collection. New friends are added to this collection. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
|
||||
By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
|
||||
|
||||
**Private**
|
||||
|
||||
By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' collection. They are not publicly visible.
|
||||
By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible.
|
||||
|
||||
|
||||
##Feed
|
||||
|
|
@ -44,7 +44,7 @@ Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may
|
|||
|
||||
**Restricted**
|
||||
|
||||
Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' collection. New connections are automatically added to this collections. Members must be manually approved by the channel owner.
|
||||
Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner.
|
||||
|
||||
|
||||
##Special
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ Some connections in the mention auto-complete box behave differently than others
|
|||
|
||||
[b]Private Mentions[/b]
|
||||
|
||||
If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or collections from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector.
|
||||
If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector.
|
||||
|
||||
You may also tag public collections. When you create or edit a collection, there is a checkbox to allow the group members to be seen by others. If this box is checked for a collection and you tag (for instance) @!Friends - the post will be restricted to the Friends collection. Check that the collection is public before doing this - as there is no way to take back a post except to delete it. The collection name will appear in the post and will alert members of that collection that they are members of it.
|
||||
You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.
|
||||
|
||||
|
||||
[b]Mentions and Comments[/b]
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ function get_features($filtered = true) {
|
|||
'net_module' => array(
|
||||
t('Network and Stream Filtering'),
|
||||
array('archives', t('Search by Date'), t('Ability to select posts by date ranges'),false,get_config('feature_lock','archives')),
|
||||
array('groups', t('Collections (Privacy Groups)'), t('Enable widget to display Network posts only from selected collections'),false,get_config('feature_lock','groups')),
|
||||
array('groups', t('Privacy Groups'), t('Enable management and selection of privacy groups'),true,get_config('feature_lock','groups')),
|
||||
array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'),false,get_config('feature_lock','savedsearch')),
|
||||
array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'),false,get_config('feature_lock','personal_tab')),
|
||||
array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity'),false,get_config('feature_lock','new_tab')),
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ function mini_group_select($uid,$group = '') {
|
|||
logger('mini_group_select: ' . print_r($grps,true), LOGGER_DATA);
|
||||
|
||||
$o = replace_macros(get_markup_template('group_selection.tpl'), array(
|
||||
'$label' => t('Add new connections to this collection (privacy group)'),
|
||||
'$label' => t('Add new connections to this privacy group'),
|
||||
'$groups' => $grps
|
||||
));
|
||||
return $o;
|
||||
|
|
@ -292,10 +292,10 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
|
|||
|
||||
$tpl = get_markup_template("group_side.tpl");
|
||||
$o = replace_macros($tpl, array(
|
||||
'$title' => t('Collections'),
|
||||
'$edittext' => t('Edit collection'),
|
||||
'$createtext' => t('Add new collection'),
|
||||
'$ungrouped' => (($every === 'contacts') ? t('Channels not in any collection') : ''),
|
||||
'$title' => t('Privacy Groups'),
|
||||
'$edittext' => t('Edit group'),
|
||||
'$createtext' => t('Add privacy group'),
|
||||
'$ungrouped' => (($every === 'contacts') ? t('Channels not in any privacy group') : ''),
|
||||
'$groups' => $groups,
|
||||
'$add' => t('add'),
|
||||
));
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ function filter_insecure($channel_id, $arr) {
|
|||
|
||||
$ret = array();
|
||||
|
||||
if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr))
|
||||
if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_privacy_groups'))) || (! $arr))
|
||||
return $arr;
|
||||
|
||||
$str = '';
|
||||
|
|
@ -4859,7 +4859,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
|
|||
intval($uid)
|
||||
);
|
||||
if(! $r) {
|
||||
$result['message'] = t('Collection not found.');
|
||||
$result['message'] = t('Privacy group not found.');
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
|
@ -4875,14 +4875,14 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
|
|||
}
|
||||
} else {
|
||||
$contact_str = ' 0 ';
|
||||
$result['message'] = t('Collection is empty.');
|
||||
$result['message'] = t('Privacy group is empty.');
|
||||
return $result;
|
||||
}
|
||||
|
||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and id = parent $item_normal ) ";
|
||||
|
||||
$x = group_rec_byhash($uid,$r[0]['hash']);
|
||||
$result['headline'] = sprintf( t('Collection: %s'),$x['name']);
|
||||
$result['headline'] = sprintf( t('Privacy group: %s'),$x['name']);
|
||||
}
|
||||
elseif($arr['cid'] && $uid) {
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ function group_post(&$a) {
|
|||
$public = intval($_POST['public']);
|
||||
$r = group_add(local_channel(),$name,$public);
|
||||
if($r) {
|
||||
info( t('Collection created.') . EOL );
|
||||
info( t('Privacy group created.') . EOL );
|
||||
$r = group_byname(local_channel(),$name);
|
||||
if($r)
|
||||
goaway($a->get_baseurl() . '/group/' . $r);
|
||||
}
|
||||
else
|
||||
notice( t('Could not create collection.') . EOL );
|
||||
notice( t('Could not create privacy group.') . EOL );
|
||||
goaway($a->get_baseurl() . '/group');
|
||||
|
||||
}
|
||||
|
|
@ -35,7 +35,7 @@ function group_post(&$a) {
|
|||
intval(local_channel())
|
||||
);
|
||||
if(! $r) {
|
||||
notice( t('Collection not found.') . EOL );
|
||||
notice( t('Privacy group not found.') . EOL );
|
||||
goaway($a->get_baseurl() . '/connections');
|
||||
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ function group_post(&$a) {
|
|||
intval($group['id'])
|
||||
);
|
||||
if($r)
|
||||
info( t('Collection updated.') . EOL );
|
||||
info( t('Privacy group updated.') . EOL );
|
||||
}
|
||||
|
||||
goaway(z_root() . '/group/' . argv(1) . '/' . argv(2));
|
||||
|
|
@ -83,8 +83,8 @@ function group_content(&$a) {
|
|||
if((argc() == 2) && (argv(1) === 'new')) {
|
||||
|
||||
return replace_macros($tpl, $context + array(
|
||||
'$title' => t('Create a collection of channels.'),
|
||||
'$gname' => array('groupname',t('Collection Name: '), '', ''),
|
||||
'$title' => t('Create a group of channels.'),
|
||||
'$gname' => array('groupname',t('Privacy group name: '), '', ''),
|
||||
'$gid' => 'new',
|
||||
'$public' => array('public',t('Members are visible to other channels'), false, ''),
|
||||
'$form_security_token' => get_form_security_token("group_edit"),
|
||||
|
|
@ -104,9 +104,9 @@ function group_content(&$a) {
|
|||
if($r)
|
||||
$result = group_rmv(local_channel(),$r[0]['name']);
|
||||
if($result)
|
||||
info( t('Collection removed.') . EOL);
|
||||
info( t('Privacy group removed.') . EOL);
|
||||
else
|
||||
notice( t('Unable to remove collection.') . EOL);
|
||||
notice( t('Unable to remove privacy group.') . EOL);
|
||||
}
|
||||
goaway($a->get_baseurl() . '/group');
|
||||
// NOTREACHED
|
||||
|
|
@ -134,7 +134,7 @@ function group_content(&$a) {
|
|||
intval(local_channel())
|
||||
);
|
||||
if(! $r) {
|
||||
notice( t('Collection not found.') . EOL );
|
||||
notice( t('Privacy group not found.') . EOL );
|
||||
goaway($a->get_baseurl() . '/connections');
|
||||
}
|
||||
$group = $r[0];
|
||||
|
|
@ -176,8 +176,8 @@ function group_content(&$a) {
|
|||
|
||||
|
||||
$context = $context + array(
|
||||
'$title' => t('Collection Editor'),
|
||||
'$gname' => array('groupname',t('Collection Name: '),$group['name'], ''),
|
||||
'$title' => t('Privacy group editor'),
|
||||
'$gname' => array('groupname',t('Privacy group name: '),$group['name'], ''),
|
||||
'$gid' => $group['id'],
|
||||
'$drop' => $drop_txt,
|
||||
'$public' => array('public',t('Members are visible to other channels'), $group['visible'], ''),
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ function network_content(&$a, $update = 0, $load = false) {
|
|||
}
|
||||
else {
|
||||
$contact_str = ' 0 ';
|
||||
info( t('Collection is empty'));
|
||||
info( t('Privacy group is empty'));
|
||||
}
|
||||
|
||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
|
||||
|
|
@ -213,7 +213,7 @@ function network_content(&$a, $update = 0, $load = false) {
|
|||
|
||||
if($x) {
|
||||
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
||||
'$title' => t('Collection: ') . $x['name']
|
||||
'$title' => t('Privacy group: ') . $x['name']
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ function settings_post(&$a) {
|
|||
);
|
||||
}
|
||||
else {
|
||||
notice( sprintf('Default privacy collection \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
|
||||
notice( sprintf('Default privacy group \'%s\' not found. Please create and re-submit permission change.', t('Friends')) . EOL);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue