diff options
| -rw-r--r-- | doc/Comparison-of-activity-stream-networks.md | 23 | ||||
| -rw-r--r-- | doc/sv/roles.md | 2 | ||||
| -rw-r--r-- | include/attach.php | 7 |
3 files changed, 25 insertions, 7 deletions
diff --git a/doc/Comparison-of-activity-stream-networks.md b/doc/Comparison-of-activity-stream-networks.md new file mode 100644 index 000000000..9d8972d7c --- /dev/null +++ b/doc/Comparison-of-activity-stream-networks.md @@ -0,0 +1,23 @@ +Comparison of different server-client networks providing activity streams to users +==================================== +The goal of this table was to provide an overview of the security and privacy provided by server-client networks providing activity-streams. + +| project | license | distributed | supports node isolation | server-to-server encryption | 1-click E2EE* | database encryption sceme | supports cloning[^5] | encryption of private messages | PFS chat | wall-to-wall interaction | supports post editing and unsend private message | other | +|-----------+---------------+-------------+-------------------------+-------------------------------------------+------------------------------------------+-----------------------------------------------------+-------------------------+-------------------------------------------------------------------------------------------------+-----------------------------------------------+--------------------------------------------------------------+--------------------------------------------------+------------------------------------------------------------------------------| +| redmatrix | ISC aka MIT | yes | yes | Zot (PKI) + TLS | yes (via JavaScript, AES-256) | content obfuscation, private keys hidden in the DB. | yes, partly implemented | impossible to message privately in plaintext | no | yes, multiple separated channels possible within one account | yes | privacy built in, run your own @ home, nodes are called hubs | +| diaspora | AGPLv3orlater | yes | no[^1] | PKI + SSL/TLS[^1] | no[^2] | mostly plaintext | no | ? | no | yes, no naming policy | no | nodes are called pods | +| facebook | proprietary | no | no | planned, probably not implemented yet[^3] | implemented but not offered to users[^4] | unknown | no, walled garden | no, 3-d party plugin Cryptocat and pidgin is availiable but the user is not informed about this | no, with Cryptocat: yes, with pidgin+OTR: yes | only one wall allowed | only post editing | "real name"-policy enforced, advertising-driven, for profit company US-based | +| twitter | proprietary | no | no | unknown | no | unknown, probably none | no, walled garden | no | no | yes | only post editing | advertising-driven, for profit company US-based | +| | | | | | | | | | | | | | + +This table was edited with emacs using org-mode. + +[^1]: https://wiki.diasporafoundation.org/Federation_protocol_overview + +[^2]: forks providing this exists + +[^3]: http://news.softpedia.com/news/Facebook-Aims-to-Encrypt-Everything-Between-Data-Centers-433091.shtml + +[^4]: http://www.computerworld.com/article/2488773/cybercrime-hacking/facebook-holds-back-on-end-to-end-encryption.html + +[^5]: see the redmatrix help files for details about this feature. diff --git a/doc/sv/roles.md b/doc/sv/roles.md index 47147c6bf..f01b2a2fb 100644 --- a/doc/sv/roles.md +++ b/doc/sv/roles.md @@ -1,4 +1,4 @@ -Behörighetsförval för kanaler +Kanaltyper och deras behörighetsförval ======================== diff --git a/include/attach.php b/include/attach.php index f61fea9a5..f878a886f 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1258,15 +1258,10 @@ function recursive_activity_recipients($allow_cid, $allow_gid, $deny_cid, $deny_ } function in_group($group_id) { - //TODO: make these two queries one with a join. - $x = q("SELECT id FROM groups WHERE hash = '%s'", + $r = q("SELECT xchan FROM group_member left join groups on group_member.gid = group.id WHERE hash = '%s' ", dbesc($group_id) ); - $r = q("SELECT xchan FROM group_member WHERE gid = %d", - intval($x[0]['id']) - ); - foreach($r as $ig) { $group_members[] = $ig['xchan']; } |