Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 34 insertions, 22 deletions

diff --git a/doc/features.bb b/doc/features.bb
index 5e42532f2..9a9de0c59 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -1,31 +1,41 @@
-[b]Features[/b]

+[b][size=20]Features[/size][/b]

 

-[b][size=24]Red Matrix Features[/size][/b]

+[b][size=24]Redmatrix in a Nutshell[/size][/b]

 

+TL;DR 

 

-The Red Matrix is a general-purpose communication network, with several unique features.  It is designed to be used by the widest range of users on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.

+Redmatrix provides distributed web publishing and social communications with [b]decentralised permissions[/b].

 

-This page lists some of the core features of Red that are bundled with the official release.  As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of Red's users.

+So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.

+

+Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; but leaving privacy in the control of the original publisher. 

+

+Redmatrix is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools. 

+

+[b][size=24]Redmatrix Features[/size][/b]

+

+

+The Redmatrix is a general-purpose web publishing and communication network, with several unique features.  It is designed to be used by the widest range of people on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.

+

+This page lists some of the core features of Redmatrix that are bundled with the official release.  As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of the members.

 

 [b][size=20]Built for Privacy and Freedom[/size][/b]

 

-One of the design goals of Red is to enable easy communication on the web, while preserving privacy, if so desired by users.  To achieve this goal, Red includes a number of features allowing arbitrary levels of privacy:

+One of the design goals of Redmatrix is to enable easy communication on the web, while preserving privacy, if so desired by members. To achieve this goal, Redmatrix includes a number of features allowing arbitrary levels of privacy:

 

 [b]Affinity Slider[/b]

 

-When adding contacts in the Red Matrix, users have the option of assigning affinity levels to the new member in their contact list.  For example, when adding someone who happens to be a person who's blog you follow, you could assign their channel an affinity level of "Acquaintances". 

-

-[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]

+When adding connnections in Redmatrix, members have the option of assigning "affinity" levels (how close your friendship is) to the new connection.  For example, when adding someone who happens to be a person whose blog you follow, you could assign their channel an affinity level of "Acquaintances". 

 

 On the other hand, when adding a friend's channel, they could be placed under the affinity level of "Friends".

 

-At this point, Red's [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" page, allows content on your Red account to be displayed by desired affinity levels. By moving the slider to cover all contacts with affinity levels of "Me" to "Friends", only contacts (or channels) that are marked as "Me", "Best Friends", and "Friends" will be displayed on your page.  All other channels and contacts, such as the contact added under affinity level "Acquaintances", will not be displayed.

+At this point, the Redmatrix [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" page, adjusts the content on the page to include those within the desired affinity range. Channels outside that range will not be displayed, unless you adjust the slider to include them.

 

 The Affinity Slider allows instantaneous filtering of large amounts of content, grouped by levels of closeness.

 

 [b]Access Control Lists[/b]

 

-When sharing content with someone in their contact list, users have the option of restricting who sees the content.  By clicking on the padlock underneath the sharing box, one may choose desired recipients of the post, by clicking on their names.

+When sharing content, members have the option of restricting who sees the content.  By clicking on the padlock underneath the sharing box, one may choose desired recipients of the post, by clicking on their names.

 

 Once sent, the message will be viewable only by the sender and the selected recipients.  In other words, the message will not appear on any public walls.

 

@@ -42,11 +52,11 @@ Files may be uploaded to your personal storage area using your operating system
 

 [b]Photo Albums[/b]

 

-Store photos in albums. These may be protected by Access Control Lists.

+Store photos in albums. All your photos may be protected by Access Control Lists.

 

 [b]Events Calendar[/b]

 

-Create and manage events, which may also be protected with Access Control Lists. Events can be exported to other software using the industry standard vcalendar/iCal format and shared in posts with others. Birthday events are automatically added from your friends and converted to your correct timezone so that you will know precisely when the birthday occurs - no matter where you are located in the world in relation to the birthday person. 

+Create and manage events, which may also be protected with Access Control Lists. Events can be exported to other software using the industry standard vcalendar/iCal format and shared in posts with others. Birthday events are automatically added from your friends and converted to your correct timezone so that you will know precisely when the birthday occurs - no matter where you are located in the world in relation to the birthday person. Events are normally created with attendance counters so your friends and connections can RSVP instantly. 

 

 [b]Chatrooms[/b]

 

@@ -90,13 +100,13 @@ Posts and messages may be created with an expiration date, at which time they wi
 

 In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as Redmatrix and may present privacy risks.

 

-There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. 

+There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your Redmatrix hub may be used as an OpenID provider to authenticate you to external services which use this technology. 

 

 Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel. 

 

 [b]Collections[/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. 

+"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).  

 

 

 [b]Directory Services[/b]

@@ -106,7 +116,7 @@ We provide easy access to a directory of members and provide decentralised tools
 

 [b]TLS/SSL[/b]

 

-For Red hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL.  Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways.

+For Redmatrix hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL.  Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways. Private communications are consequently encrypted at a higher level before sending offsite.

 

 [b]Channel Settings[/b]

 

@@ -114,8 +124,6 @@ When a channel is created, a role is chosen which applies a number of pre-config
 

 If you choose a "custom" privacy role, each channel allows fine-grained permissions to be set for various aspects of communication.  For example, under the "Security and Privacy Settings" heading, each aspect on the left side of the page, has six (6) possible viewing/access options, that can be selected by clicking on the dropdown menu. There are also a number of other privacy settings you may edit.  

 

-[img]https://friendicared.net/photo/0f5be8da282858edd645b0a1a6626491.png[/img]

-

 The options are:

 

  - Nobody except yourself.

@@ -134,7 +142,7 @@ Forums are typically channels which may be open to participation from multiple a
 

 [b]Account Cloning[/b]

 

-Accounts in the Red Matrix are referred to as [i]nomadic identities[/i], because a user's identity is not bound to the hub where the identity was originally created (see What is Zot? for the full explanation).  For example, when you create a Facebook or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  

+Accounts in the Red Matrix are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created.  For example, when you create a Facebook or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  

 

 By contrast, say you've created a Red identity called [b]tina@redhub.com[/b].  You can clone it to another Red hub by choosing the same, or a different name: [b]liveForever@SomeRedMatrixHub.info[/b]

 

@@ -142,11 +150,11 @@ Both channels are now synchronized, which means all your contacts and preference
 

 This is a rather revolutionary feature, if we consider some scenarios:

 

- - What happens if the hub where an identity is based suddenly goes offline?  Without cloning, a user will not be able to communicate until that hub comes back online.  With cloning, you just log into your cloned account, and life goes on happily ever after.

+ - What happens if the hub where an identity is based suddenly goes offline?  Without cloning, a member will not be able to communicate until that hub comes back online (no doubt many of you have seen and cursed the Twitter "Fail Whale").  With cloning, you just log into your cloned account, and life goes on happily ever after. 

 

  - The administrator of your hub can no longer afford to pay for his free and public Red Matrix hub. He announces that the hub will be shutting down in two weeks.  This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.

 

- - What if your identity is subject to government censorship?  Your hub provider is compelled to delete your account, along with any identities and associated data.  With cloning, the Red Matrix offers [b]censorship resistance[/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  

+ - What if your identity is subject to government censorship?  Your hub provider may be compelled to delete your account, along with any identities and associated data.  With cloning, the Red Matrix offers [b]censorship resistance[/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  

 

 Red offers interesting new possibilities for privacy. You can read more at the <<Private Communications Best Practices>> page.

 

@@ -154,7 +162,7 @@ Some caveats apply. For a full explanation of identity cloning, read the <HOW
 

 [b]Multiple Profiles[/b]

 

-Any number of profiles may be created containing different information and these may be made visible to certain of your connections/friends. A "default" profile can be seen by anybody and may contain limited information, with more information available to select groups or people. 

+Any number of profiles may be created containing different information and these may be made visible to certain of your connections/friends. A "default" profile can be seen by anybody and may contain limited information, with more information available to select groups or people. This means that the profile (and site content) your beer-drinking buddies see may be different than what your co-workers see, and also completely different from what is visible to the general public. 

 

 [b]Account Backup[/b]

 

@@ -175,7 +183,7 @@ Red supports a number of different ways of adding rich-text content. The default
 When creating "Websites", content may be entered in HTML, Markdown, BBcode, and/or plain text.

 

 [b]Deletion of content[/b]

-Any content created in the Red Matrix remains under the control of the member (or channel) that originally created it.  At any time, a member can delete a message, or a range of messages.  The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot.

+Any content created in the Red Matrix remains under the control of the member (or channel) that originally created it.  At any time, a member can delete a message, or a range of messages.  The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot (the Redmatrix communication and authentication protocol).

 

 [b]Media[/b]

 Similar to any other modern blogging system, social network, or a micro-blogging service, Red supports the uploading of files, embedding of videos, linking web pages.

@@ -183,6 +191,10 @@ Similar to any other modern blogging system, social network, or a micro-blogging
 [b]Previewing/Editing[/b] 

 Post can be previewed prior to sending and edited after sending.

 

+[b]Voting/Concensus[/b]

+Posts can be turned into "concensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys. 

+

+

 [b]Extending Redmatrix[/b]

 

 Redmatrix can be extended in a number of ways, through site customisation, personal customisation, option setting, themes, and addons/plugins.