issue #241 (redmatrix issue 405)

6 files changed, 112 insertions, 100 deletions

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index b8a241f26..3c8f34321 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -240,8 +240,8 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
 		'$showall'         => $showall,
-		'$show'		       => t("Show"),
-		'$hide'		       => t("Don't show"),
+		'$show'	           => t("Show"),
+		'$hide'	           => t("Don't show"),
 		'$allowcid'        => json_encode($allow_cid),
 		'$allowgid'        => json_encode($allow_gid),
 		'$denycid'         => json_encode($deny_cid),
diff --git a/mod/wfinger.php b/mod/wfinger.php
index 8b9abe4af..5270c8f31 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -101,6 +101,11 @@ function wfinger_init(&$a) {
 			),
 
 			array(
+				'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+				'template' => z_root() . '/follow/url={uri}',
+			),
+
+			array(
 				'rel' => 'http://purl.org/zot/protocol',
 				'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
 			)
diff --git a/mod/xrd.php b/mod/xrd.php
index a373f8bf5..34ed47149 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -50,6 +50,7 @@ function xrd_init(&$a) {
 //		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'],
 //		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['channel_address'] . '/mention',
 		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
+		'$subscribe'   => $a->get_baseurl() . '/follow?url={uri}',
 //		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
 	));
 
diff --git a/util/hmessages.po b/util/hmessages.po
index 643128c8e..a301a2f78 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-12-25.1257\n"
+"Project-Id-Version: 2016-01-01.1264\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-25 00:03-0800\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -143,358 +143,358 @@ msgstr ""
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:785
+#: ../../include/text.php:803
 msgid "No connections"
 msgstr ""
 
-#: ../../include/text.php:797
+#: ../../include/text.php:815
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
 msgid "View Connections"
 msgstr ""
 
-#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/text.php:885 ../../include/text.php:897
 #: ../../include/nav.php:159 ../../include/apps.php:147
 #: ../../mod/search.php:40
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/text.php:886 ../../include/text.php:898
 #: ../../include/widgets.php:192 ../../mod/rbmark.php:28
 #: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
 #: ../../mod/filer.php:49
 msgid "Save"
 msgstr ""
 
-#: ../../include/text.php:954
+#: ../../include/text.php:972
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:954 ../../include/conversation.php:243
+#: ../../include/text.php:972 ../../include/conversation.php:243
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:955
+#: ../../include/text.php:973
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:955
+#: ../../include/text.php:973
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:956
+#: ../../include/text.php:974
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:956
+#: ../../include/text.php:974
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:957
+#: ../../include/text.php:975
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:957
+#: ../../include/text.php:975
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:958
+#: ../../include/text.php:976
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:958
+#: ../../include/text.php:976
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:959
+#: ../../include/text.php:977
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:959
+#: ../../include/text.php:977
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:969
+#: ../../include/text.php:987
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:970
+#: ../../include/text.php:988
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:971
+#: ../../include/text.php:989
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:972
+#: ../../include/text.php:990
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:973
+#: ../../include/text.php:991
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:974
+#: ../../include/text.php:992
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:975
-msgid "stupified"
+#: ../../include/text.php:993
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/text.php:976
+#: ../../include/text.php:994
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:977
+#: ../../include/text.php:995
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:978
+#: ../../include/text.php:996
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:979
+#: ../../include/text.php:997
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:980
+#: ../../include/text.php:998
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:981
+#: ../../include/text.php:999
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:983
+#: ../../include/text.php:1001
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:984
+#: ../../include/text.php:1002
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:985
+#: ../../include/text.php:1003
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:986
+#: ../../include/text.php:1004
 msgid "depressed"
 msgstr ""
 
-#: ../../include/text.php:987
+#: ../../include/text.php:1005
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:988
+#: ../../include/text.php:1006
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:989
+#: ../../include/text.php:1007
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:70
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:71
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:72
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:73
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:74
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:75
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:69
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:45
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:46
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:47
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:48
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1183
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:50
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:51
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:52
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:53
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:54
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:55
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:56
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1242 ../../include/text.php:1246
+#: ../../include/text.php:1260 ../../include/text.php:1264
 msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
 #: ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr ""
 
-#: ../../include/text.php:1248
+#: ../../include/text.php:1266
 msgid "unknown"
 msgstr ""
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1302
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1361
+#: ../../include/text.php:1379
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/text.php:1410 ../../include/event.php:22
 #: ../../include/bb2diaspora.php:465
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/text.php:1414 ../../include/event.php:30
 #: ../../include/bb2diaspora.php:471
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/text.php:1418 ../../include/event.php:40
 #: ../../include/bb2diaspora.php:479
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/text.php:1425 ../../include/event.php:52
 #: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
 #: ../../mod/directory.php:304
 msgid "Location:"
 msgstr ""
 
-#: ../../include/text.php:1503 ../../include/text.php:1514
+#: ../../include/text.php:1521 ../../include/text.php:1532
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1698 ../../mod/events.php:623
+#: ../../include/text.php:1716 ../../mod/events.php:623
 msgid "Link to Source"
 msgstr ""
 
-#: ../../include/text.php:1719 ../../include/text.php:1791
+#: ../../include/text.php:1737 ../../include/text.php:1809
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1769
+#: ../../include/text.php:1787
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:1803
+#: ../../include/text.php:1821
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../include/text.php:1940 ../../include/conversation.php:120
 #: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "photo"
 msgstr ""
 
-#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/text.php:1943 ../../include/event.php:904
 #: ../../include/conversation.php:123 ../../mod/tagger.php:47
 #: ../../mod/like.php:363 ../../mod/events.php:249
 msgid "event"
 msgstr ""
 
-#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../include/text.php:1946 ../../include/conversation.php:148
 #: ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "status"
 msgstr ""
 
-#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../include/text.php:1948 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1935
+#: ../../include/text.php:1953
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2230
+#: ../../include/text.php:2248
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2233 ../../mod/blocks.php:147
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr ""
 
-#: ../../include/text.php:2234 ../../mod/menu.php:103
+#: ../../include/text.php:2252 ../../mod/menu.php:103
 msgid "Menus"
 msgstr ""
 
-#: ../../include/text.php:2235 ../../mod/layouts.php:174
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr ""
 
-#: ../../include/text.php:2236
+#: ../../include/text.php:2254
 msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr ""
 
@@ -1354,29 +1354,29 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/acl_selectors.php:240
+#: ../../include/acl_selectors.php:218
 msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
 msgid "Show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
 msgid "Don't show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
 #: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
 #: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr ""
 
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
 #: ../../mod/photos.php:1215
 msgid "Close"
 msgstr ""
@@ -3433,19 +3433,19 @@ msgstr ""
 msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/follow.php:152 ../../include/follow.php:181
+#: ../../include/follow.php:153 ../../include/follow.php:183
 msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/follow.php:171
+#: ../../include/follow.php:173
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:197
+#: ../../include/follow.php:199
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:221
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr ""
 
@@ -6607,6 +6607,10 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr ""
+
 #: ../../mod/network.php:207
 msgid "Collection is empty"
 msgstr ""
diff --git a/version.inc b/version.inc
index 481650b0d..479ab9124 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-31.1263
+2016-01-01.1264
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 631ed3f18..754eb3944 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -17,6 +17,8 @@
     <Link rel="http://microformats.org/profile/hcard"
           type="text/html"
           href="{{$hcard_url}}" />
+    <Link rel="http://ostatus.org/schema/1.0/subscribe"
+          template="{{$subscribe}}" />
 
    <Link rel="magic-public-key"
           href="{{$modexp}}" />