harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #241 (redmatrix issue 405)

Browse Source
This commit is contained in:
redmatrix 2016-01-01 16:12:43 -08:00
parent 9ee7d60afe
commit c38edfcb32
6 changed files with 112 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/acl_selectors.php
View File

@ -240,8 +240,8 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
$tpl = get_markup_template("acl_selector.tpl"); $tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$showall' => $showall, '$showall' => $showall,
'$show' => t("Show"), '$show' => t("Show"),
'$hide' => t("Don't show"), '$hide' => t("Don't show"),
'$allowcid' => json_encode($allow_cid), '$allowcid' => json_encode($allow_cid),
'$allowgid' => json_encode($allow_gid), '$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid), '$denycid' => json_encode($deny_cid),

5
mod/wfinger.php
View File

@ -100,6 +100,11 @@ function wfinger_init(&$a) {
'href' => z_root() . '/channel/' . $r[0]['channel_address'], 'href' => z_root() . '/channel/' . $r[0]['channel_address'],
), ),
array(
'rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => z_root() . '/follow/url={uri}',
),
array( array(
'rel' => 'http://purl.org/zot/protocol', 'rel' => 'http://purl.org/zot/protocol',
'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'], 'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],

1
mod/xrd.php
View File

@ -50,6 +50,7 @@ function xrd_init(&$a) {
// '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'], // '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'],
// '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention', // '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention',
'$modexp' => 'data:application/magic-public-key,' . $salmon_key, '$modexp' => 'data:application/magic-public-key,' . $salmon_key,
'$subscribe' => $a->get_baseurl() . '/follow?url={uri}',
// '$bigkey' => salmon_key($r[0]['pubkey']) // '$bigkey' => salmon_key($r[0]['pubkey'])
)); ));

198
util/hmessages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2015-12-25.1257\n" "Project-Id-Version: 2016-01-01.1264\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -143,358 +143,358 @@ msgstr ""
msgid "newer" msgid "newer"
msgstr "" msgstr ""
#: ../../include/text.php:785 #: ../../include/text.php:803
msgid "No connections" msgid "No connections"
msgstr "" msgstr ""
#: ../../include/text.php:797 #: ../../include/text.php:815
#, php-format #, php-format
msgid "%d Connection" msgid "%d Connection"
msgid_plural "%d Connections" msgid_plural "%d Connections"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../include/text.php:810 ../../mod/viewconnections.php:101 #: ../../include/text.php:828 ../../mod/viewconnections.php:101
msgid "View Connections" msgid "View Connections"
msgstr "" 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 #: ../../include/nav.php:159 ../../include/apps.php:147
#: ../../mod/search.php:40 #: ../../mod/search.php:40
msgid "Search" msgid "Search"
msgstr "" 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 #: ../../include/widgets.php:192 ../../mod/rbmark.php:28
#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474 #: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
#: ../../mod/filer.php:49 #: ../../mod/filer.php:49
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: ../../include/text.php:954 #: ../../include/text.php:972
msgid "poke" msgid "poke"
msgstr "" msgstr ""
#: ../../include/text.php:954 ../../include/conversation.php:243 #: ../../include/text.php:972 ../../include/conversation.php:243
msgid "poked" msgid "poked"
msgstr "" msgstr ""
#: ../../include/text.php:955 #: ../../include/text.php:973
msgid "ping" msgid "ping"
msgstr "" msgstr ""
#: ../../include/text.php:955 #: ../../include/text.php:973
msgid "pinged" msgid "pinged"
msgstr "" msgstr ""
#: ../../include/text.php:956 #: ../../include/text.php:974
msgid "prod" msgid "prod"
msgstr "" msgstr ""
#: ../../include/text.php:956 #: ../../include/text.php:974
msgid "prodded" msgid "prodded"
msgstr "" msgstr ""
#: ../../include/text.php:957 #: ../../include/text.php:975
msgid "slap" msgid "slap"
msgstr "" msgstr ""
#: ../../include/text.php:957 #: ../../include/text.php:975
msgid "slapped" msgid "slapped"
msgstr "" msgstr ""
#: ../../include/text.php:958 #: ../../include/text.php:976
msgid "finger" msgid "finger"
msgstr "" msgstr ""
#: ../../include/text.php:958 #: ../../include/text.php:976
msgid "fingered" msgid "fingered"
msgstr "" msgstr ""
#: ../../include/text.php:959 #: ../../include/text.php:977
msgid "rebuff" msgid "rebuff"
msgstr "" msgstr ""
#: ../../include/text.php:959 #: ../../include/text.php:977
msgid "rebuffed" msgid "rebuffed"
msgstr "" msgstr ""
#: ../../include/text.php:969 #: ../../include/text.php:987
msgid "happy" msgid "happy"
msgstr "" msgstr ""
#: ../../include/text.php:970 #: ../../include/text.php:988
msgid "sad" msgid "sad"
msgstr "" msgstr ""
#: ../../include/text.php:971 #: ../../include/text.php:989
msgid "mellow" msgid "mellow"
msgstr "" msgstr ""
#: ../../include/text.php:972 #: ../../include/text.php:990
msgid "tired" msgid "tired"
msgstr "" msgstr ""
#: ../../include/text.php:973 #: ../../include/text.php:991
msgid "perky" msgid "perky"
msgstr "" msgstr ""
#: ../../include/text.php:974 #: ../../include/text.php:992
msgid "angry" msgid "angry"
msgstr "" msgstr ""
#: ../../include/text.php:975 #: ../../include/text.php:993
msgid "stupified" msgid "stupefied"
msgstr "" msgstr ""
#: ../../include/text.php:976 #: ../../include/text.php:994
msgid "puzzled" msgid "puzzled"
msgstr "" msgstr ""
#: ../../include/text.php:977 #: ../../include/text.php:995
msgid "interested" msgid "interested"
msgstr "" msgstr ""
#: ../../include/text.php:978 #: ../../include/text.php:996
msgid "bitter" msgid "bitter"
msgstr "" msgstr ""
#: ../../include/text.php:979 #: ../../include/text.php:997
msgid "cheerful" msgid "cheerful"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:998
msgid "alive" msgid "alive"
msgstr "" msgstr ""
#: ../../include/text.php:981 #: ../../include/text.php:999
msgid "annoyed" msgid "annoyed"
msgstr "" msgstr ""
#: ../../include/text.php:982 #: ../../include/text.php:1000
msgid "anxious" msgid "anxious"
msgstr "" msgstr ""
#: ../../include/text.php:983 #: ../../include/text.php:1001
msgid "cranky" msgid "cranky"
msgstr "" msgstr ""
#: ../../include/text.php:984 #: ../../include/text.php:1002
msgid "disturbed" msgid "disturbed"
msgstr "" msgstr ""
#: ../../include/text.php:985 #: ../../include/text.php:1003
msgid "frustrated" msgid "frustrated"
msgstr "" msgstr ""
#: ../../include/text.php:986 #: ../../include/text.php:1004
msgid "depressed" msgid "depressed"
msgstr "" msgstr ""
#: ../../include/text.php:987 #: ../../include/text.php:1005
msgid "motivated" msgid "motivated"
msgstr "" msgstr ""
#: ../../include/text.php:988 #: ../../include/text.php:1006
msgid "relaxed" msgid "relaxed"
msgstr "" msgstr ""
#: ../../include/text.php:989 #: ../../include/text.php:1007
msgid "surprised" msgid "surprised"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:70 #: ../../include/text.php:1179 ../../include/js_strings.php:70
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:71 #: ../../include/text.php:1179 ../../include/js_strings.php:71
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:72 #: ../../include/text.php:1179 ../../include/js_strings.php:72
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:73 #: ../../include/text.php:1179 ../../include/js_strings.php:73
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:74 #: ../../include/text.php:1179 ../../include/js_strings.php:74
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:75 #: ../../include/text.php:1179 ../../include/js_strings.php:75
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: ../../include/text.php:1161 ../../include/js_strings.php:69 #: ../../include/text.php:1179 ../../include/js_strings.php:69
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:45 #: ../../include/text.php:1183 ../../include/js_strings.php:45
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:46 #: ../../include/text.php:1183 ../../include/js_strings.php:46
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:47 #: ../../include/text.php:1183 ../../include/js_strings.php:47
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:48 #: ../../include/text.php:1183 ../../include/js_strings.php:48
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../include/text.php:1165 #: ../../include/text.php:1183
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:50 #: ../../include/text.php:1183 ../../include/js_strings.php:50
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:51 #: ../../include/text.php:1183 ../../include/js_strings.php:51
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:52 #: ../../include/text.php:1183 ../../include/js_strings.php:52
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:53 #: ../../include/text.php:1183 ../../include/js_strings.php:53
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:54 #: ../../include/text.php:1183 ../../include/js_strings.php:54
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:55 #: ../../include/text.php:1183 ../../include/js_strings.php:55
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../include/text.php:1165 ../../include/js_strings.php:56 #: ../../include/text.php:1183 ../../include/js_strings.php:56
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../include/text.php:1242 ../../include/text.php:1246 #: ../../include/text.php:1260 ../../include/text.php:1264
msgid "Unknown Attachment" msgid "Unknown Attachment"
msgstr "" msgstr ""
#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237 #: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
#: ../../mod/sharedwithme.php:97 #: ../../mod/sharedwithme.php:97
msgid "Size" msgid "Size"
msgstr "" msgstr ""
#: ../../include/text.php:1248 #: ../../include/text.php:1266
msgid "unknown" msgid "unknown"
msgstr "" msgstr ""
#: ../../include/text.php:1284 #: ../../include/text.php:1302
msgid "remove category" msgid "remove category"
msgstr "" msgstr ""
#: ../../include/text.php:1361 #: ../../include/text.php:1379
msgid "remove from file" msgid "remove from file"
msgstr "" msgstr ""
#: ../../include/text.php:1392 ../../include/event.php:22 #: ../../include/text.php:1410 ../../include/event.php:22
#: ../../include/bb2diaspora.php:465 #: ../../include/bb2diaspora.php:465
msgid "l F d, Y \\@ g:i A" msgid "l F d, Y \\@ g:i A"
msgstr "" msgstr ""
#: ../../include/text.php:1396 ../../include/event.php:30 #: ../../include/text.php:1414 ../../include/event.php:30
#: ../../include/bb2diaspora.php:471 #: ../../include/bb2diaspora.php:471
msgid "Starts:" msgid "Starts:"
msgstr "" msgstr ""
#: ../../include/text.php:1400 ../../include/event.php:40 #: ../../include/text.php:1418 ../../include/event.php:40
#: ../../include/bb2diaspora.php:479 #: ../../include/bb2diaspora.php:479
msgid "Finishes:" msgid "Finishes:"
msgstr "" 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 #: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
#: ../../mod/directory.php:304 #: ../../mod/directory.php:304
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
#: ../../include/text.php:1503 ../../include/text.php:1514 #: ../../include/text.php:1521 ../../include/text.php:1532
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1698 ../../mod/events.php:623 #: ../../include/text.php:1716 ../../mod/events.php:623
msgid "Link to Source" msgid "Link to Source"
msgstr "" msgstr ""
#: ../../include/text.php:1719 ../../include/text.php:1791 #: ../../include/text.php:1737 ../../include/text.php:1809
msgid "default" msgid "default"
msgstr "" msgstr ""
#: ../../include/text.php:1727 #: ../../include/text.php:1745
msgid "Page layout" msgid "Page layout"
msgstr "" msgstr ""
#: ../../include/text.php:1727 #: ../../include/text.php:1745
msgid "You can create your own with the layouts tool" msgid "You can create your own with the layouts tool"
msgstr "" msgstr ""
#: ../../include/text.php:1769 #: ../../include/text.php:1787
msgid "Page content type" msgid "Page content type"
msgstr "" msgstr ""
#: ../../include/text.php:1803 #: ../../include/text.php:1821
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "" 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 #: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "photo" msgid "photo"
msgstr "" 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 #: ../../include/conversation.php:123 ../../mod/tagger.php:47
#: ../../mod/like.php:363 ../../mod/events.php:249 #: ../../mod/like.php:363 ../../mod/events.php:249
msgid "event" msgid "event"
msgstr "" 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 #: ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../include/text.php:1930 ../../include/conversation.php:150 #: ../../include/text.php:1948 ../../include/conversation.php:150
#: ../../mod/tagger.php:53 #: ../../mod/tagger.php:53
msgid "comment" msgid "comment"
msgstr "" msgstr ""
#: ../../include/text.php:1935 #: ../../include/text.php:1953
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: ../../include/text.php:2230 #: ../../include/text.php:2248
msgid "Design Tools" msgid "Design Tools"
msgstr "" msgstr ""
#: ../../include/text.php:2233 ../../mod/blocks.php:147 #: ../../include/text.php:2251 ../../mod/blocks.php:147
msgid "Blocks" msgid "Blocks"
msgstr "" msgstr ""
#: ../../include/text.php:2234 ../../mod/menu.php:103 #: ../../include/text.php:2252 ../../mod/menu.php:103
msgid "Menus" msgid "Menus"
msgstr "" msgstr ""
#: ../../include/text.php:2235 ../../mod/layouts.php:174 #: ../../include/text.php:2253 ../../mod/layouts.php:174
msgid "Layouts" msgid "Layouts"
msgstr "" msgstr ""
#: ../../include/text.php:2236 #: ../../include/text.php:2254
msgid "Pages" msgid "Pages"
msgstr "" msgstr ""
#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131 #: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
msgid "Collection" msgid "Collection"
msgstr "" msgstr ""
@ -1354,29 +1354,29 @@ msgstr ""
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:240 #: ../../include/acl_selectors.php:218
msgid "Visible to your default audience" msgid "Visible to your default audience"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:241 #: ../../include/acl_selectors.php:243
msgid "Show" msgid "Show"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:242 #: ../../include/acl_selectors.php:244
msgid "Don't show" msgid "Don't show"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:247 #: ../../include/acl_selectors.php:249
msgid "Other networks and post services" msgid "Other networks and post services"
msgstr "" 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/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
#: ../../mod/photos.php:998 ../../mod/chat.php:211 #: ../../mod/photos.php:998 ../../mod/chat.php:211
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384 #: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
#: ../../mod/photos.php:1215 #: ../../mod/photos.php:1215
msgid "Close" msgid "Close"
msgstr "" msgstr ""
@ -3433,19 +3433,19 @@ msgstr ""
msgid "Channel was deleted and no longer exists." msgid "Channel was deleted and no longer exists."
msgstr "" msgstr ""
#: ../../include/follow.php:152 ../../include/follow.php:181 #: ../../include/follow.php:153 ../../include/follow.php:183
msgid "Protocol disabled." msgid "Protocol disabled."
msgstr "" msgstr ""
#: ../../include/follow.php:171 #: ../../include/follow.php:173
msgid "Channel discovery failed." msgid "Channel discovery failed."
msgstr "" msgstr ""
#: ../../include/follow.php:197 #: ../../include/follow.php:199
msgid "local account not found." msgid "local account not found."
msgstr "" msgstr ""
#: ../../include/follow.php:221 #: ../../include/follow.php:224
msgid "Cannot connect to yourself." msgid "Cannot connect to yourself."
msgstr "" msgstr ""
@ -6607,6 +6607,10 @@ msgstr ""
msgid "Search Results For:" msgid "Search Results For:"
msgstr "" msgstr ""
#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
msgid "Public"
msgstr ""
#: ../../mod/network.php:207 #: ../../mod/network.php:207
msgid "Collection is empty" msgid "Collection is empty"
msgstr "" msgstr ""

2
version.inc
View File

@ -1 +1 @@
2015-12-31.1263 2016-01-01.1264

2
view/tpl/xrd_person.tpl
View File

@ -17,6 +17,8 @@
<Link rel="http://microformats.org/profile/hcard" <Link rel="http://microformats.org/profile/hcard"
type="text/html" type="text/html"
href="{{$hcard_url}}" /> href="{{$hcard_url}}" />
<Link rel="http://ostatus.org/schema/1.0/subscribe"
template="{{$subscribe}}" />
<Link rel="magic-public-key" <Link rel="magic-public-key"
href="{{$modexp}}" /> href="{{$modexp}}" />