diff --git a/boot.php b/boot.php index 59eeb464..97a4f96c 100644 --- a/boot.php +++ b/boot.php @@ -8,9 +8,9 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1120' ); +define ( 'FRIENDIKA_VERSION', '2.3.1121' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1093 ); +define ( 'DB_UPDATE_VERSION', 1094 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index f39728a3..15e2f2cc 100644 --- a/database.sql +++ b/database.sql @@ -114,6 +114,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( CREATE TABLE IF NOT EXISTS `group` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(10) unsigned NOT NULL, + `visible` tinyint(1) NOT NULL DEFAULT '0', `deleted` tinyint(1) NOT NULL DEFAULT '0', `name` char(255) NOT NULL, PRIMARY KEY (`id`) @@ -632,3 +633,12 @@ CREATE TABLE IF NOT EXISTS `search` ( INDEX ( `uid` ), INDEX ( `term` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `fserver` ( +`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , +`server` CHAR( 255 ) NOT NULL , +`posturl` CHAR( 255 ) NOT NULL , +`key` TEXT NOT NULL, +INDEX ( `server` ) +) ENGINE = MyISAM DEFAULT CHARSET=utf8; + diff --git a/include/delivery.php b/include/delivery.php index 3ab820b6..46112d78 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -96,6 +96,8 @@ function delivery_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` diff --git a/include/notifier.php b/include/notifier.php index 864fa517..d1cd1cc7 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -123,6 +123,9 @@ function notifier_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; + $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC", intval($parent_id) diff --git a/js/main.js b/js/main.js index 896cbeb5..e0694e47 100644 --- a/js/main.js +++ b/js/main.js @@ -95,6 +95,16 @@ if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } + $('#intro-update').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } + $('#mail-update').html(mail); + + + var eNotif = $(data).find('notif') notif = eNotif.attr('count'); if (notif>0){ diff --git a/mod/photo.php b/mod/photo.php index 71c345fc..a5a5a1dc 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -128,6 +128,11 @@ function photo_init(&$a) { } } + if(function_exists('header_remove')) { + header_remove('Pragma'); + header_remove('pragma'); + } + header("Content-type: image/jpeg"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT"); header("Cache-Control: max-age=" . (3600*24)); diff --git a/mod/photos.php b/mod/photos.php index 90d51000..1321af19 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -92,15 +92,11 @@ EOT; function photos_post(&$a) { - logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG'); + logger('mod-photos: photos_post(): begin' , 'LOGGER_DEBUG'); - foreach($_REQUEST AS $key => $val) { - logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); - } - foreach($_FILES AS $key => $val) { - logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); - } + logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); + logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA); $can_post = false; $visitor = 0; @@ -585,6 +581,9 @@ function photos_post(&$a) { else $visible = 0; + if(intval($_REQUEST['not_visible'])) + $visible = 0; + $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow']))); $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow']))); $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny']))); @@ -892,6 +891,7 @@ function photos_content(&$a) { '$nickname' => $a->data['user']['nickname'], '$newalbum' => t('New album name: '), '$existalbumtext' => t('or existing album name: '), + '$nosharetext' => t('Do not show a status post for this upload'), '$albumselect' => template_escape($albumselect), '$permissions' => t('Permissions'), '$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))), diff --git a/mod/ping.php b/mod/ping.php index 30f1dc83..544a42e1 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -114,7 +114,7 @@ function ping_init(&$a) { function xmlize($href, $name, $url, $photo, $date, $message){ $notsxml = '%s'; return sprintf ( $notsxml, - $href, $name, $url, $photo, $date, $message + xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($message) ); } diff --git a/update.php b/update.php index 0dd599e8..723f12c1 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@
+
+ + +
+
diff --git a/view/theme/darkbubble/calendar.png b/view/theme/darkbubble/calendar.png deleted file mode 100644 index 705a75b8..00000000 Binary files a/view/theme/darkbubble/calendar.png and /dev/null differ diff --git a/view/theme/darkbubble/connect.png b/view/theme/darkbubble/connect.png deleted file mode 100644 index b76fc13d..00000000 Binary files a/view/theme/darkbubble/connect.png and /dev/null differ diff --git a/view/theme/darkbubble/contact_edit.tpl b/view/theme/darkbubble/contact_edit.tpl deleted file mode 100644 index 59747c62..00000000 --- a/view/theme/darkbubble/contact_edit.tpl +++ /dev/null @@ -1,67 +0,0 @@ - -

$header

- -
$name
- -$nettype - -
- - -
- - -
- - -
- - {{ if $poll_enabled }} -
-
$lastupdtext$last_update
-
$updpub
- $poll_interval - -
- {{ endif }} -
-
- -$insecure -$blocked -$ignored - - -$lblsuggest - -
-

$lbl_info1

- -
-
- - - -
-

$lbl_vis1

-

$lbl_vis2 -

-
-$profile_select -
- - - - -
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png new file mode 100644 index 00000000..696ef779 Binary files /dev/null and b/view/theme/darkbubble/dbicons.png differ diff --git a/view/theme/darkbubble/group_drop.tpl b/view/theme/darkbubble/group_drop.tpl deleted file mode 100644 index f088fc06..00000000 --- a/view/theme/darkbubble/group_drop.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- Delete Group -
-
diff --git a/view/theme/darkbubble/group_edit.tpl b/view/theme/darkbubble/group_edit.tpl deleted file mode 100644 index a8b3f92a..00000000 --- a/view/theme/darkbubble/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$title

- - -
-
-
- - - - $drop -
-
-
$desc
-
-
-
diff --git a/view/theme/darkbubble/groups.png b/view/theme/darkbubble/groups.png deleted file mode 100644 index a65a7218..00000000 Binary files a/view/theme/darkbubble/groups.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.png b/view/theme/darkbubble/icons.png deleted file mode 100644 index 57c4bfb0..00000000 Binary files a/view/theme/darkbubble/icons.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.svg b/view/theme/darkbubble/icons.svg deleted file mode 100644 index b435ba66..00000000 --- a/view/theme/darkbubble/icons.svg +++ /dev/null @@ -1,1442 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - YouTube - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem Ip - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - ? - - diff --git a/view/theme/darkbubble/jot-header.tpl b/view/theme/darkbubble/jot-header.tpl deleted file mode 100644 index 0093bf82..00000000 --- a/view/theme/darkbubble/jot-header.tpl +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - diff --git a/view/theme/darkbubble/jot.tpl b/view/theme/darkbubble/jot.tpl deleted file mode 100644 index d60e8adc..00000000 --- a/view/theme/darkbubble/jot.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
 
- -
- -
-
- -
- - - - - - - - - - - {{ if $content }}{{ endif }} - - - - - - - - - - - - - - -
- -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
-
-
diff --git a/view/theme/darkbubble/login-bg.gif b/view/theme/darkbubble/login-bg.gif deleted file mode 100644 index cde836c8..00000000 Binary files a/view/theme/darkbubble/login-bg.gif and /dev/null differ diff --git a/view/theme/darkbubble/login.tpl b/view/theme/darkbubble/login.tpl deleted file mode 100644 index 2c879d69..00000000 --- a/view/theme/darkbubble/login.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
- -
- - -
-
-
- - -
-
-
- - $lostlink -
-
- -
-
- diff --git a/view/theme/darkbubble/lrarrow.gif b/view/theme/darkbubble/lrarrow.gif deleted file mode 100644 index fa267694..00000000 Binary files a/view/theme/darkbubble/lrarrow.gif and /dev/null differ diff --git a/view/theme/darkbubble/mail_head.tpl b/view/theme/darkbubble/mail_head.tpl deleted file mode 100644 index 89615cbd..00000000 --- a/view/theme/darkbubble/mail_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

$messages

- - diff --git a/view/theme/darkbubble/menu-user-pin.png b/view/theme/darkbubble/menu-user-pin.png deleted file mode 100644 index 6becfbb6..00000000 Binary files a/view/theme/darkbubble/menu-user-pin.png and /dev/null differ diff --git a/view/theme/darkbubble/nav.tpl b/view/theme/darkbubble/nav.tpl deleted file mode 100644 index a2171d43..00000000 --- a/view/theme/darkbubble/nav.tpl +++ /dev/null @@ -1,55 +0,0 @@ - - diff --git a/view/theme/darkbubble/next.png b/view/theme/darkbubble/next.png deleted file mode 100644 index 353e2e72..00000000 Binary files a/view/theme/darkbubble/next.png and /dev/null differ diff --git a/view/theme/darkbubble/notifications.png b/view/theme/darkbubble/notifications.png deleted file mode 100644 index 803257fe..00000000 Binary files a/view/theme/darkbubble/notifications.png and /dev/null differ diff --git a/view/theme/darkbubble/photo_view.tpl b/view/theme/darkbubble/photo_view.tpl deleted file mode 100644 index 4582751c..00000000 --- a/view/theme/darkbubble/photo_view.tpl +++ /dev/null @@ -1,40 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}
$tags.3
{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate - diff --git a/view/theme/darkbubble/photography.png b/view/theme/darkbubble/photography.png deleted file mode 100644 index 7ec919f2..00000000 Binary files a/view/theme/darkbubble/photography.png and /dev/null differ diff --git a/view/theme/darkbubble/premium.png b/view/theme/darkbubble/premium.png deleted file mode 100644 index 1ad601c0..00000000 Binary files a/view/theme/darkbubble/premium.png and /dev/null differ diff --git a/view/theme/darkbubble/prev.png b/view/theme/darkbubble/prev.png deleted file mode 100644 index 0ae6022a..00000000 Binary files a/view/theme/darkbubble/prev.png and /dev/null differ diff --git a/view/theme/darkbubble/profile_entry.tpl b/view/theme/darkbubble/profile_entry.tpl deleted file mode 100644 index 82c04cc2..00000000 --- a/view/theme/darkbubble/profile_entry.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-$alt -
-
- -
$visible
-
-
- diff --git a/view/theme/darkbubble/profile_tabs.tpl b/view/theme/darkbubble/profile_tabs.tpl deleted file mode 100644 index c236490b..00000000 --- a/view/theme/darkbubble/profile_tabs.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- $status - $profile - $photos - {{ if $events }}$events{{ endif }} - {{ if $notes }}$notes{{ endif }} -
-
diff --git a/view/theme/darkbubble/profile_vcard.tpl b/view/theme/darkbubble/profile_vcard.tpl deleted file mode 100644 index 0ee6919b..00000000 --- a/view/theme/darkbubble/profile_vcard.tpl +++ /dev/null @@ -1,45 +0,0 @@ -
-
$profile.name
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/darkbubble/search.png b/view/theme/darkbubble/search.png deleted file mode 100644 index 51c42859..00000000 Binary files a/view/theme/darkbubble/search.png and /dev/null differ diff --git a/view/theme/darkbubble/search_item.tpl b/view/theme/darkbubble/search_item.tpl deleted file mode 100644 index 7e5bfbe7..00000000 --- a/view/theme/darkbubble/search_item.tpl +++ /dev/null @@ -1,48 +0,0 @@ -
-
-
-
- - $name - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
- -
- -
-
- {{ if $conv }}$conv.title{{ endif }} -
-
-
- -
diff --git a/view/theme/darkbubble/star.png b/view/theme/darkbubble/star.png deleted file mode 100644 index a327ba14..00000000 Binary files a/view/theme/darkbubble/star.png and /dev/null differ diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css index 03434d7f..9336dc01 100644 --- a/view/theme/darkbubble/style.css +++ b/view/theme/darkbubble/style.css @@ -1,7 +1,33 @@ @import url('../testbubble/style.css'); +.icon { + background-image: url('dbicons.png'); +} + body { background: #000000; color: #dddddd; } +.info-message { + color: #444444; +} + +#id_openid_url { + background: url(../testbubble/login-bg.gif) no-repeat #ffffff; + background-position: 0 50%; + padding-left: 18px; + width: 385px; + color: #000000; +} + +.vevent, .eventcal { + color: #000000; +} +.event-list-date { + color: #DDDDDD; +} + +.fortunate { + color: #8888FF !important; +} \ No newline at end of file diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php new file mode 100644 index 00000000..326c98bb --- /dev/null +++ b/view/theme/darkbubble/theme.php @@ -0,0 +1,4 @@ +theme_info = array( + 'extends' => 'testbubble', +); diff --git a/view/theme/darkbubble/user.png b/view/theme/darkbubble/user.png deleted file mode 100644 index df899e7e..00000000 Binary files a/view/theme/darkbubble/user.png and /dev/null differ diff --git a/view/theme/darkbubble/wall_item.tpl b/view/theme/darkbubble/wall_item.tpl deleted file mode 100644 index 70ec00dd..00000000 --- a/view/theme/darkbubble/wall_item.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
-
- - $name - - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
$title
-
-
$body
-
- -
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
- - -
- -
- $name -
$ago
- -
-
-
- -
$dislike
-
- $comment -
-
- -
- diff --git a/view/theme/darkbubble/wallwall_item.tpl b/view/theme/darkbubble/wallwall_item.tpl deleted file mode 100644 index 8819103a..00000000 --- a/view/theme/darkbubble/wallwall_item.tpl +++ /dev/null @@ -1,74 +0,0 @@ -
-
-
-
- - $owner_name -
-
$wall
-
- - $name - menu -
-
    - $item_photo_menu -
-
- -
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
-
-
-
- -
$dislike
-
- $comment -
-
- -
- diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl index 82ac178e..efc95bde 100644 --- a/view/theme/duepuntozero/nav.tpl +++ b/view/theme/duepuntozero/nav.tpl @@ -32,7 +32,7 @@ {{ endif }} {{ if $nav.notifications }} $nav.notifications.1 - + {{ endif }} {{ if $nav.messages }} $nav.messages.1 diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1fe8fb2f..4769da8a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1559,6 +1559,8 @@ input#dfrn-url { display:block!important; } + + #acl-wrapper { width: 690px; float:left; @@ -1917,6 +1919,10 @@ a.mail-list-link { float: left; width: 175px; } + +#photos-upload-noshare { + margin-bottom: 10px; +} #photos-upload-existing-album-text { float: left; width: 175px; diff --git a/zot.txt b/zot.txt index 300b695f..b160788e 100644 --- a/zot.txt +++ b/zot.txt @@ -1,7 +1,7 @@ This is the Zot! social communications protocol. Specification revision: 1 -15 September 2011 +2 October 2011 Mike Macgirvin This specification is public domain. @@ -78,16 +78,21 @@ zot:env ******* This consists of RFC822-style header fields representing the sender and -recipient(s). Example: +recipient(s). Line lengths have no defined limit and RFC822 continuation +lines are not supported. If an inbound server is not able to process an +envelope or post due to size constraints, it SHOULD return a +"413 Entity too large" HTTP response. -From: bob@example.com -Sender: bob@example.com -To: alice@example.com +Example: -Both "From:" and "Sender:" MUST be provided, and represent a webfinger -address of the author and sender respectively. The webfinger address for -the From address MUST contain a discoverable salmon public key that -is needed to verify the enclosed salmon data. Sender is used to indicate +Z-From: zot:bob@example.com +Z-Sender: zot:bob@example.com +Z-To: zot:alice@example.com + +Both "Z-From:" and "Z-Sender:" MUST be provided, and represent a single +webfinger address of the author and sender respectively. The webfinger +address for the From address MUST contain a discoverable salmon public key +which is needed to verify the enclosed salmon data. Sender is used to indicate the webfinger identity responsible for transmitting this message. From indicates the message author. @@ -95,46 +100,91 @@ In web-based social systems, a reply to a message SHOULD be conveyed to all of the original message participants. Only the author of the original message may know all the recipients (such as those contained in Bcc: elements). The author of a message always provides 'From'. They MUST duplicate this -information as 'Sender'. +information as 'Sender' when posting a followup message. -A reply to a given message MUST be sent to the original From address, and MAY -be sent to any additional addresses in the recipient list. The original author -MUST send the reply to all known recipients of the original message, with -their webfinger identity as Sender, and the comment/reply author as From. +A reply to a given message MUST be sent to the From address of the original +post, and MAY be sent to any additional addresses in the recipient list. The +original post author MUST send the reply to all known recipients of the +original message, with their webfinger identity as Sender, and the +comment/reply author as From. Receiving agents SHOULD validate the From identity as the signer of the salmon magic envelope, and MAY reject it. They SHOULD also verify the Sender signature of the zot packet if it is different than the salmon signature. They MAY reject the message if the Sender is not allowed in their "friend list", or if they do not have a suitable relationship with the Sender, or if either -signature fails to validate. +signature fails to validate. Rejected messages for one of these reasons SHOULD +be indicated with a "400 Bad Request" HTTP response. -To: * +Z-To: * indicates a public message with no specifically enumerated recipients. -The fields To:, Cc:, and/or Bcc: MAY be present. At least one recipient field -MUST be present. These fields may use the entire syntax specified by RFC822, -for example: +The fields Z-To: and/or Z-Bcc: MAY be present. At least one recipient field +MUST be present. -To: "Bob Smith" , "Alice Jones" +Z-To: zot:bob@example.com, zot:alice@example.com, mailto:dave@example.com +Z-Bcc: zot:https://example.com/profile/richard -is a valid entry. A zot envelope is UTF-8 encoded, which differs from RFC822. -The host component MUST be US-ASCII, with punycode translation of -internationalised domain names applied. +are valid entries. Adresses are comma separated and individual entries MUST NOT +contain commas. There MAY be any number of ASCII space characters between +entries for legibility. Header lines are terminated with a linefeed character +(ASCII 0x0A). -The entire envelope is then encrypted using alg with env_key and env_iv and +This specification provides the following foreign protocol address prefixes +for use in Z-To: or Z-Bcc: elements: + +zot: - normal zot delivery using webfinger or LRDD resolvable address +ostatus: - normal OStatus delivery using webfinger or LRDD resovable address +diaspora: - Diaspora network delivery using webfinger address +facebook: - Facebook profile page URL +twitter: - Twitter personal page URL without AJAX '#!' fragment +mailto: - email RFC822/ESMTP address + +Examples: + +twitter:http://twitter.com/bjensen +facebook:http://facebook.com/profile.php?id=000000001 + +Foreign protocol addresses which have not been defined in this specification +or future revisions of this specification and which are unknown to the +recipient delivery process MAY be ignored. + +In cases where an address may contain either a webfinger or LRDD address, the +webfinger address SHOULD be used preferentially. + + +Z-Bcc: +****** + +The Z-Bcc element may contain one or more addresses which are hidden from end +user presentation. A zot receiving system MUST NOT store or allow for +the display of the Bcc information. Implementations which require extreme +privacy SHOULD send individual posts to each of the Bcc: recipients containing +only a single address. They MAY send all Bcc: posts using bulk delivery, +however this may have privacy implications as there is no guarantee a +receiving system will not log, store, or otherwise reveal the contents of the +Bcc recipient list. + +Z-To: addresses MAY be shown to an end user. + + +Envelope encryption +******************* + + +The entire envelope is encrypted using alg with env_key and env_iv and base64url encoded for transmission. -The zot envelope MAY include remote addresses. A zot delivery agent MUST parse -all addresses and determine whether a delivery address to the current endpoint -is valid. This may be the result of: +The zot envelope MAY include remote addresses. A zot inbound delivery agent +MUST parse the envelope and determine whether a delivery address to the +current endpoint is valid. This may be the result of: 1. An address contains the public message wildcard '*' 2. The current endpoint is a personal endpoint and one of the recipients -listed in the To:, Cc:, or Bcc: addresses matches the webfinger address of +listed in the Z-To: or Z-Bcc: addresses matches the webfinger address of the "owner" of the endpoint. 3. The current endpoint is a bulk delivery endpoint. The bulk delivery @@ -219,7 +269,8 @@ We anticipate this specification will in the future allow for a close variant of "message/rfc822" and which may include MIME. This may also be used to embed alternate message formats and protocols such as "application/x-diaspora+xml". If a delivery agent is unable to provide any -acceptable data format, the delivery MUST be terminated/cancelled. +acceptable data format to the remote system, the delivery to that system MUST +be terminated/cancelled. Foreign Messages **************** @@ -233,9 +284,18 @@ systems MAY reject foreign messages. -********************** -* Zid authentication * -********************** + + +******************************* +* Zid (Zot-ID) authentication * +******************************* + +This section of the document is considered separate from the delivery +specification precding it and represents a different protocol, which is +currently incomplete. This will be split off into another document in the +future, but is presented here as a synergistic component of the Zot network +model. + URLs may be present within a zot message which refer to private and/or protected resources. Zid uses OpenID to gain access to these protected