diff options
| -rw-r--r-- | assets/home.html | 18 | ||||
| -rw-r--r-- | include/notifier.php | 17 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 17 insertions, 20 deletions
diff --git a/assets/home.html b/assets/home.html index 3fe3d02d7..48a7c126d 100644 --- a/assets/home.html +++ b/assets/home.html @@ -167,21 +167,17 @@ $(document).ready(function() { <center> <img style="width: 330px; margin-top: 30px; margin-bottom: 30px;" src="assets/hashlogo.png" > -<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">"The Network"</div> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -The RedMatrix (aka "<span style="color: #c60032;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin. +<div id="word-flasher" style="font-size: 2.5em; font-weight: bold; margin-bottom: 30px;">"The Network"</div> +<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> +The RedMatrix is a super network created from a huge number of smaller independent and autonomous websites - which are linked together into a cooperative publishing and social platform. It consists of an open source webapp providing a complete multi-user <strong>decentralised</strong> publishing, sharing, and communications system - known as a "hub". Each hub provides communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) in a feature-rich platform. These hubs automatically reach out and connect with the rest of the matrix. Privacy and content ownership always remain under the direct personal control of the individual; and permission to access any item can be granted or denied to anybody in the entire matrix. </div> <br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. This ties all RedMatrix sites and channels together into a single super-network where the boundaries between different websites are blurred or seemingly non-existent; where "who you are" has nothing to do with "what computer you're connected to", and where website content can adapt itself according to who is viewing it. +<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> +What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. No other platform provides this ability. Within the matrix the boundaries between different hubs are blurred or seemingly non-existent. Identity in the matrix is considered transient and potentially nomadic. "Who you are" has nothing to do with "what computer you're connected to", and website content can adapt itself according to who is viewing it. You have the ability to "clone" your identity to other hubs; which allows you to continue to communicate with your friends seamlessly if your primary hub is ever disabled (temporarily or permanently). </div> <br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a server or router in another country is having "<em>issues</em>". -</div> -<br /> -<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> -For the average person, the biggest advantage of decentralised identity is that you decide who you want to share your stuff with, and if somebody isn't on your list, they're not going to see it. It's all under your control (we're big on privacy). Use the RedMatrix as a social network or a business website or for personal cloud storage or media publishing - or any number of other uses; limited only by your imagination.<br /> +<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> +The RedMatrix is ideal for social communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.<br /> </div> <br /> <div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - "The Network"</strong></div> diff --git a/include/notifier.php b/include/notifier.php index 59f472539..9d5c7cb8e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -169,6 +169,15 @@ function notifier_run($argv, $argc){ } elseif($cmd === 'expire') { + + // FIXME + // This will require a special zot packet containing a list of item message_id's to be expired. + // This packet will be public, since we cannot selectively deliver here. + // We need the handling on this end to create the array, and the handling on the remote end + // to verify permissions (for each item) and process it. Until this is complete, the expire feature will be disabled. + + return; + $normal_mode = false; $expire = true; $items = q("SELECT * FROM item WHERE uid = %d AND ( item_flags & %d ) @@ -182,13 +191,6 @@ function notifier_run($argv, $argc){ if(! $items) return; -// FIXME -// This will require a special zot packet containing a list of item message_id's to be expired. -// This packet will be public, since we cannot selectively deliver here. -// We need the handling on this end to create the array, and the handling on the remote end -// to verify permissions (for each item) and process it. Until this is complete, the expire feature will be disabled. - - return; } elseif($cmd === 'suggest') { $normal_mode = false; @@ -423,7 +425,6 @@ function notifier_run($argv, $argc){ $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); - if($relay_to_owner && (! $private) && ($cmd !== 'relay')) { // If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions. diff --git a/version.inc b/version.inc index 0ecd5d881..b8709271f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-07-05.727 +2014-07-06.728 |