aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/deliver.php4
-rw-r--r--include/zot.php52
-rw-r--r--util/messages.po368
-rw-r--r--version.inc2
4 files changed, 221 insertions, 205 deletions
diff --git a/include/deliver.php b/include/deliver.php
index 5ab44a620..26739fb06 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -92,12 +92,12 @@ function deliver_run($argv, $argc) {
$m = json_decode($r[0]['outq_msg'],true);
if(array_key_exists('message_list',$m)) {
foreach($m['message_list'] as $mm) {
- $msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $mm)))));
+ $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm)))));
zot_import($msg,z_root());
}
}
else {
- $msg = array('body' => json_encode(array('pickup' => array(array('notify' => $notify,'message' => $m)))));
+ $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
zot_import($msg,z_root());
}
$r = q("delete from outq where outq_hash = '%s'",
diff --git a/include/zot.php b/include/zot.php
index a81c13707..82199ab1c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -543,7 +543,7 @@ function zot_refresh($them, $channel = null, $force = false) {
* @returns array|null null if site is blacklisted or not found, otherwise an
* array with an hubloc record
*/
-function zot_gethub($arr) {
+function zot_gethub($arr,$multiple = false) {
if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) {
@@ -562,18 +562,20 @@ function zot_gethub($arr) {
return null;
}
+ $limit = (($multiple) ? '' : ' limit 1 ');
+
$r = q("select * from hubloc
where hubloc_guid = '%s' and hubloc_guid_sig = '%s'
and hubloc_url = '%s' and hubloc_url_sig = '%s'
- limit 1",
+ $limit",
dbesc($arr['guid']),
dbesc($arr['guid_sig']),
dbesc($arr['url']),
dbesc($arr['url_sig'])
);
- if($r && count($r)) {
+ if($r) {
logger('zot_gethub: found', LOGGER_DEBUG);
- return $r[0];
+ return (($multiple) ? $r : $r[0]);
}
}
logger('zot_gethub: not found: ' . print_r($arr,true), LOGGER_DEBUG);
@@ -1017,27 +1019,38 @@ function zot_fetch($arr) {
$url = $arr['sender']['url'] . $arr['callback'];
- $ret_hub = zot_gethub($arr['sender']);
- if(! $ret_hub) {
+ // set $multiple param on zot_gethub() to return all matching hubs
+ // This allows us to recover from re-installs when a redundant (but invalid) hubloc for
+ // this identity is widely dispersed throughout the network.
+
+ $ret_hubs = zot_gethub($arr['sender'],true);
+ if(! $ret_hubs) {
logger('zot_fetch: no hub: ' . print_r($arr['sender'],true));
return;
}
- $data = array(
- 'type' => 'pickup',
- 'url' => z_root(),
- 'callback_sig' => base64url_encode(rsa_sign(z_root() . '/post',get_config('system','prvkey'))),
- 'callback' => z_root() . '/post',
- 'secret' => $arr['secret'],
- 'secret_sig' => base64url_encode(rsa_sign($arr['secret'],get_config('system','prvkey')))
- );
+ foreach($ret_hubs as $ret_hub) {
+ $data = array(
+ 'type' => 'pickup',
+ 'url' => z_root(),
+ 'callback_sig' => base64url_encode(rsa_sign(z_root() . '/post',get_config('system','prvkey'))),
+ 'callback' => z_root() . '/post',
+ 'secret' => $arr['secret'],
+ 'secret_sig' => base64url_encode(rsa_sign($arr['secret'],get_config('system','prvkey')))
+ );
- $datatosend = json_encode(crypto_encapsulate(json_encode($data),$ret_hub['hubloc_sitekey']));
+ $datatosend = json_encode(crypto_encapsulate(json_encode($data),$ret_hub['hubloc_sitekey']));
- $fetch = zot_zot($url,$datatosend);
- $result = zot_import($fetch, $arr['sender']['url']);
+ $fetch = zot_zot($url,$datatosend);
+
+ $result = zot_import($fetch, $arr['sender']['url']);
+
+ if($result)
+ return $result;
+ }
+
+ return;
- return $result;
}
/**
@@ -1076,6 +1089,9 @@ function zot_import($arr, $sender_url) {
$data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true);
}
+ if(! $data['success'])
+ return false;
+
$incoming = $data['pickup'];
$return = array();
diff --git a/util/messages.po b/util/messages.po
index ae59da483..c6ec4b717 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-09-04.1145\n"
+"Project-Id-Version: 2015-09-11.1152\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-04 00:04-0700\n"
+"POT-Creation-Date: 2015-09-11 00:05-0700\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"
@@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/connections.php:274 ../../mod/blocks.php:153
#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
-#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183
+#: ../../mod/menu.php:106 ../../mod/settings.php:650 ../../mod/layouts.php:183
msgid "Edit"
msgstr ""
@@ -251,7 +251,7 @@ msgstr ""
msgid "YYYY-MM-DD or MM-DD"
msgstr ""
-#: ../../include/datetime.php:235 ../../mod/events.php:649
+#: ../../include/datetime.php:235 ../../mod/events.php:672
#: ../../mod/appman.php:91 ../../mod/appman.php:92
msgid "Required"
msgstr ""
@@ -346,9 +346,9 @@ msgstr ""
#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
#: ../../include/dir_fns.php:130 ../../mod/api.php:106
-#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
-#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
-#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
#: ../../mod/settings.php:579 ../../mod/removeme.php:60
#: ../../mod/connedit.php:647 ../../mod/connedit.php:675
@@ -359,9 +359,9 @@ msgstr ""
#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
#: ../../include/dir_fns.php:130 ../../mod/api.php:105
-#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158
-#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91
-#: ../../mod/menu.php:147 ../../mod/filestorage.php:151
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
#: ../../mod/settings.php:579 ../../mod/removeme.php:60
#: ../../view/theme/redbasic/php/config.php:104
@@ -388,7 +388,7 @@ msgstr ""
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
#: ../../include/conversation.php:1166 ../../mod/webpages.php:188
-#: ../../mod/events.php:667 ../../mod/editpost.php:143
+#: ../../mod/events.php:690 ../../mod/editpost.php:143
#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
#: ../../mod/editblock.php:170
msgid "Preview"
@@ -407,12 +407,12 @@ msgid "Title"
msgstr ""
#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192
-#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181
+#: ../../mod/blocks.php:150 ../../mod/menu.php:108 ../../mod/layouts.php:181
msgid "Created"
msgstr ""
#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193
-#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182
+#: ../../mod/blocks.php:151 ../../mod/menu.php:109 ../../mod/layouts.php:182
msgid "Edited"
msgstr ""
@@ -497,11 +497,11 @@ msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303
-#: ../../mod/thing.php:346 ../../mod/events.php:494 ../../mod/events.php:670
+#: ../../mod/thing.php:346 ../../mod/events.php:511 ../../mod/events.php:693
#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177
-#: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167
+#: ../../mod/chat.php:211 ../../mod/mitem.php:235 ../../mod/rate.php:167
#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
@@ -880,7 +880,7 @@ msgstr ""
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1661 ../../mod/events.php:457
+#: ../../include/text.php:1661 ../../mod/events.php:474
msgid "Link to Source"
msgstr ""
@@ -905,19 +905,19 @@ msgid "Select an alternate language"
msgstr ""
#: ../../include/text.php:1884 ../../include/diaspora.php:2119
-#: ../../include/conversation.php:120 ../../mod/like.php:346
+#: ../../include/conversation.php:120 ../../mod/like.php:349
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
#: ../../mod/tagger.php:43
msgid "photo"
msgstr ""
#: ../../include/text.php:1887 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
+#: ../../mod/like.php:351 ../../mod/tagger.php:47
msgid "event"
msgstr ""
#: ../../include/text.php:1890 ../../include/diaspora.php:2119
-#: ../../include/conversation.php:148 ../../mod/like.php:346
+#: ../../include/conversation.php:148 ../../mod/like.php:349
#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
msgid "status"
msgstr ""
@@ -939,7 +939,7 @@ msgstr ""
msgid "Blocks"
msgstr ""
-#: ../../include/text.php:2196 ../../mod/menu.php:98
+#: ../../include/text.php:2196 ../../mod/menu.php:101
msgid "Menus"
msgstr ""
@@ -1012,7 +1012,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:256
#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:152 ../../mod/menu.php:109
+#: ../../mod/blocks.php:152 ../../mod/menu.php:112
#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175
msgid "Create"
msgstr ""
@@ -1374,7 +1374,7 @@ msgstr ""
#: ../../include/widgets.php:136 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:903 ../../mod/directory.php:316
+#: ../../include/identity.php:933 ../../mod/directory.php:316
#: ../../mod/match.php:64 ../../mod/suggest.php:52
msgid "Connect"
msgstr ""
@@ -1551,12 +1551,12 @@ msgid "Finishes:"
msgstr ""
#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:954 ../../mod/directory.php:302
-#: ../../mod/events.php:661
+#: ../../include/identity.php:984 ../../mod/directory.php:302
+#: ../../mod/events.php:684
msgid "Location:"
msgstr ""
-#: ../../include/event.php:535
+#: ../../include/event.php:549
msgid "This event has been added to your calendar."
msgstr ""
@@ -1755,7 +1755,7 @@ msgid "Stored post could not be verified."
msgstr ""
#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
-#: ../../mod/like.php:394
+#: ../../mod/like.php:397
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr ""
@@ -1855,7 +1855,7 @@ msgid "View all"
msgstr ""
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1213
+#: ../../include/conversation.php:1712 ../../include/identity.php:1243
#: ../../mod/photos.php:1019
msgctxt "noun"
msgid "Like"
@@ -2107,7 +2107,7 @@ msgstr ""
msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/nav.php:95 ../../include/identity.php:926
+#: ../../include/nav.php:95 ../../include/identity.php:956
msgid "Edit Profile"
msgstr ""
@@ -2281,7 +2281,7 @@ msgid "Outbox"
msgstr ""
#: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:486
+#: ../../mod/events.php:503
msgid "Events"
msgstr ""
@@ -2532,7 +2532,7 @@ msgstr ""
msgid "channel"
msgstr ""
-#: ../../include/conversation.php:167 ../../mod/like.php:396
+#: ../../include/conversation.php:167 ../../mod/like.php:399
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
@@ -2851,13 +2851,13 @@ msgstr ""
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1249 ../../mod/events.php:651
+#: ../../include/conversation.php:1249 ../../mod/events.php:674
#: ../../mod/editpost.php:153
msgid "OK"
msgstr ""
#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:134 ../../mod/events.php:650 ../../mod/fbrowser.php:82
+#: ../../mod/tagrm.php:134 ../../mod/events.php:673 ../../mod/fbrowser.php:82
#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
#: ../../mod/settings.php:589 ../../mod/settings.php:615
msgid "Cancel"
@@ -2892,7 +2892,7 @@ msgid "Posts that mention or involve you"
msgstr ""
#: ../../include/conversation.php:1524 ../../mod/connections.php:72
-#: ../../mod/connections.php:85 ../../mod/menu.php:107
+#: ../../mod/connections.php:85 ../../mod/menu.php:110
msgid "New"
msgstr ""
@@ -2994,7 +2994,7 @@ msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/items.php:413 ../../mod/like.php:270
+#: ../../include/items.php:413 ../../mod/like.php:273
#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
#: ../../mod/bulksetclose.php:11 ../../index.php:392
msgid "Permission denied"
@@ -3037,14 +3037,14 @@ msgstr ""
msgid "Visible to specific connections."
msgstr ""
-#: ../../include/items.php:4218 ../../mod/thing.php:74
+#: ../../include/items.php:4223 ../../mod/thing.php:74
#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
#: ../../mod/display.php:36
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4291 ../../include/attach.php:137
+#: ../../include/items.php:4296 ../../include/attach.php:137
#: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3056,18 +3056,18 @@ msgstr ""
#: ../../mod/thing.php:284 ../../mod/thing.php:318
#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:232 ../../mod/group.php:9 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
+#: ../../mod/events.php:249 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1005 ../../mod/network.php:12
#: ../../mod/common.php:35 ../../mod/connections.php:29
#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:109
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:111
#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
+#: ../../mod/menu.php:72 ../../mod/filestorage.php:18
#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
#: ../../mod/poke.php:128 ../../mod/profiles.php:188
@@ -3087,38 +3087,38 @@ msgstr ""
msgid "Permission denied."
msgstr ""
-#: ../../include/items.php:4693 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4700 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../mod/bulksetclose.php:51
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4709
+#: ../../include/items.php:4716
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4716
+#: ../../include/items.php:4723
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4726 ../../mod/connedit.php:674
+#: ../../include/items.php:4733 ../../mod/connedit.php:674
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4728
+#: ../../include/items.php:4735
msgid "Connection not found."
msgstr ""
-#: ../../include/zot.php:666
+#: ../../include/zot.php:675
msgid "Invalid data packet"
msgstr ""
-#: ../../include/zot.php:682
+#: ../../include/zot.php:691
msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/zot.php:2133
+#: ../../include/zot.php:2142
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""
@@ -3215,7 +3215,7 @@ msgstr ""
msgid "Don't show"
msgstr ""
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:668
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:691
#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
#: ../../mod/filestorage.php:147
msgid "Permissions"
@@ -3316,11 +3316,11 @@ msgstr ""
msgid "Default Profile"
msgstr ""
-#: ../../include/identity.php:706
+#: ../../include/identity.php:736
msgid "Requested channel is not available."
msgstr ""
-#: ../../include/identity.php:753 ../../mod/profile.php:16
+#: ../../include/identity.php:783 ../../mod/profile.php:16
#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3329,193 +3329,193 @@ msgstr ""
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:916 ../../mod/profiles.php:774
+#: ../../include/identity.php:946 ../../mod/profiles.php:774
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:922
+#: ../../include/identity.php:952
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:922
+#: ../../include/identity.php:952
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:923 ../../mod/profiles.php:775
+#: ../../include/identity.php:953 ../../mod/profiles.php:775
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:938 ../../mod/profiles.php:786
+#: ../../include/identity.php:968 ../../mod/profiles.php:786
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:941
+#: ../../include/identity.php:971
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:942 ../../mod/profiles.php:669
+#: ../../include/identity.php:972 ../../mod/profiles.php:669
#: ../../mod/profiles.php:790
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:958 ../../include/identity.php:1197
+#: ../../include/identity.php:988 ../../include/identity.php:1227
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:959 ../../include/identity.php:1241
+#: ../../include/identity.php:989 ../../include/identity.php:1271
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:960 ../../include/identity.php:1252
+#: ../../include/identity.php:990 ../../include/identity.php:1282
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:961
+#: ../../include/identity.php:991
msgid "Online Now"
msgstr ""
-#: ../../include/identity.php:1044 ../../include/identity.php:1122
+#: ../../include/identity.php:1074 ../../include/identity.php:1152
#: ../../mod/ping.php:324
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:1045 ../../include/identity.php:1123
+#: ../../include/identity.php:1075 ../../include/identity.php:1153
msgid "F d"
msgstr ""
-#: ../../include/identity.php:1090 ../../include/identity.php:1162
+#: ../../include/identity.php:1120 ../../include/identity.php:1192
#: ../../mod/ping.php:346
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:1101
+#: ../../include/identity.php:1131
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:1102
+#: ../../include/identity.php:1132
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:1155
+#: ../../include/identity.php:1185
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:1173
+#: ../../include/identity.php:1203
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:1174
+#: ../../include/identity.php:1204
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:1187 ../../include/identity.php:1304
+#: ../../include/identity.php:1217 ../../include/identity.php:1334
#: ../../include/apps.php:138 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
-#: ../../include/identity.php:1195 ../../mod/settings.php:1056
+#: ../../include/identity.php:1225 ../../mod/settings.php:1056
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:1202
+#: ../../include/identity.php:1232
msgid "Like this channel"
msgstr ""
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1256
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:1227
+#: ../../include/identity.php:1257
msgid "j F"
msgstr ""
-#: ../../include/identity.php:1234
+#: ../../include/identity.php:1264
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:1238 ../../mod/directory.php:297
+#: ../../include/identity.php:1268 ../../mod/directory.php:297
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:1247
+#: ../../include/identity.php:1277
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:1250 ../../mod/profiles.php:691
+#: ../../include/identity.php:1280 ../../mod/profiles.php:691
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:1254 ../../mod/directory.php:313
+#: ../../include/identity.php:1284 ../../mod/directory.php:313
#: ../../mod/profiles.php:693
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:1256
+#: ../../include/identity.php:1286
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:1258 ../../mod/profiles.php:694
+#: ../../include/identity.php:1288 ../../mod/profiles.php:694
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:1260
+#: ../../include/identity.php:1290
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:1262 ../../mod/directory.php:315
+#: ../../include/identity.php:1292 ../../mod/directory.php:315
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1264
+#: ../../include/identity.php:1294
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1266 ../../mod/profiles.php:697
+#: ../../include/identity.php:1296 ../../mod/profiles.php:697
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1268 ../../mod/profiles.php:698
+#: ../../include/identity.php:1298 ../../mod/profiles.php:698
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1270
+#: ../../include/identity.php:1300
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1272
+#: ../../include/identity.php:1302
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1274
+#: ../../include/identity.php:1304
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1276
+#: ../../include/identity.php:1306
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1278
+#: ../../include/identity.php:1308
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1280
+#: ../../include/identity.php:1310
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1282
+#: ../../include/identity.php:1312
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1284
+#: ../../include/identity.php:1314
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1316
msgid "School/education:"
msgstr ""
-#: ../../include/identity.php:1306
+#: ../../include/identity.php:1336
msgid "Like this thing"
msgstr ""
@@ -3989,7 +3989,7 @@ msgstr ""
msgid "Homepage: "
msgstr ""
-#: ../../mod/directory.php:308 ../../mod/events.php:659
+#: ../../mod/directory.php:308 ../../mod/events.php:682
msgid "Description:"
msgstr ""
@@ -4061,7 +4061,7 @@ msgstr ""
msgid "Lookup xchan beginning with (or webbie): "
msgstr ""
-#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:116 ../../mod/menu.php:160
msgid "Not found."
msgstr ""
@@ -4331,45 +4331,45 @@ msgstr ""
msgid "Channel unavailable."
msgstr ""
-#: ../../mod/like.php:228
+#: ../../mod/like.php:231
msgid "Previous action reversed."
msgstr ""
-#: ../../mod/like.php:398
+#: ../../mod/like.php:401
#, php-format
msgid "%1$s agrees with %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:400
+#: ../../mod/like.php:403
#, php-format
msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:402
+#: ../../mod/like.php:405
#, php-format
msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:404
+#: ../../mod/like.php:407
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:406
+#: ../../mod/like.php:409
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:408
+#: ../../mod/like.php:411
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr ""
-#: ../../mod/like.php:493
+#: ../../mod/like.php:507
msgid "Action completed."
msgstr ""
-#: ../../mod/like.php:494
+#: ../../mod/like.php:508
msgid "Thank you."
msgstr ""
@@ -4397,89 +4397,89 @@ msgstr ""
msgid "Event not found."
msgstr ""
-#: ../../mod/events.php:409
+#: ../../mod/events.php:426
msgid "l, F j"
msgstr ""
-#: ../../mod/events.php:431
+#: ../../mod/events.php:448
msgid "Edit event"
msgstr ""
-#: ../../mod/events.php:432
+#: ../../mod/events.php:449
msgid "Delete event"
msgstr ""
-#: ../../mod/events.php:466
+#: ../../mod/events.php:483
msgid "calendar"
msgstr ""
-#: ../../mod/events.php:487
+#: ../../mod/events.php:504
msgid "Create New Event"
msgstr ""
-#: ../../mod/events.php:488 ../../mod/photos.php:839
+#: ../../mod/events.php:505 ../../mod/photos.php:839
msgid "Previous"
msgstr ""
-#: ../../mod/events.php:489 ../../mod/photos.php:848 ../../mod/setup.php:281
+#: ../../mod/events.php:506 ../../mod/photos.php:848 ../../mod/setup.php:281
msgid "Next"
msgstr ""
-#: ../../mod/events.php:490
+#: ../../mod/events.php:507
msgid "Export"
msgstr ""
-#: ../../mod/events.php:493
+#: ../../mod/events.php:510
msgid "Import"
msgstr ""
-#: ../../mod/events.php:518
+#: ../../mod/events.php:541
msgid "Event removed"
msgstr ""
-#: ../../mod/events.php:521
+#: ../../mod/events.php:544
msgid "Failed to remove event"
msgstr ""
-#: ../../mod/events.php:641
+#: ../../mod/events.php:664
msgid "Event details"
msgstr ""
-#: ../../mod/events.php:642
+#: ../../mod/events.php:665
msgid "Starting date and Title are required."
msgstr ""
-#: ../../mod/events.php:644
+#: ../../mod/events.php:667
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../mod/events.php:646
+#: ../../mod/events.php:669
msgid "Event Starts:"
msgstr ""
-#: ../../mod/events.php:653
+#: ../../mod/events.php:676
msgid "Finish date/time is not known or not relevant"
msgstr ""
-#: ../../mod/events.php:655
+#: ../../mod/events.php:678
msgid "Event Finishes:"
msgstr ""
-#: ../../mod/events.php:657 ../../mod/events.php:658
+#: ../../mod/events.php:680 ../../mod/events.php:681
msgid "Adjust for viewer timezone"
msgstr ""
-#: ../../mod/events.php:657
+#: ../../mod/events.php:680
msgid ""
"Important for events that happen in a particular place. Not practical for "
"global holidays."
msgstr ""
-#: ../../mod/events.php:663
+#: ../../mod/events.php:686
msgid "Title:"
msgstr ""
-#: ../../mod/events.php:665
+#: ../../mod/events.php:688
msgid "Share this event"
msgstr ""
@@ -4659,20 +4659,20 @@ msgstr ""
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:901
+#: ../../mod/item.php:914
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1119
+#: ../../mod/item.php:1146
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../mod/item.php:1126
+#: ../../mod/item.php:1153
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1133
+#: ../../mod/item.php:1160
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -5227,7 +5227,7 @@ msgstr ""
msgid "%1$s's Chatrooms"
msgstr ""
-#: ../../mod/mitem.php:24 ../../mod/menu.php:134
+#: ../../mod/mitem.php:24 ../../mod/menu.php:138
msgid "Menu not found."
msgstr ""
@@ -5235,115 +5235,115 @@ msgstr ""
msgid "Unable to create element."
msgstr ""
-#: ../../mod/mitem.php:71
+#: ../../mod/mitem.php:72
msgid "Unable to update menu element."
msgstr ""
-#: ../../mod/mitem.php:86
+#: ../../mod/mitem.php:88
msgid "Unable to add menu element."
msgstr ""
-#: ../../mod/mitem.php:152 ../../mod/mitem.php:223
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:226
msgid "Menu Item Permissions"
msgstr ""
-#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:227 ../../mod/settings.php:1083
msgid "(click to open/close)"
msgstr ""
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:171
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:173
msgid "Link Name"
msgstr ""
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:231
msgid "Link or Submenu Target"
msgstr ""
-#: ../../mod/mitem.php:156
+#: ../../mod/mitem.php:158
msgid "Enter URL of the link or select a menu name to create a submenu"
msgstr ""
-#: ../../mod/mitem.php:157 ../../mod/mitem.php:229
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:232
msgid "Use magic-auth if available"
msgstr ""
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:230
+#: ../../mod/mitem.php:160 ../../mod/mitem.php:233
msgid "Open link in new window"
msgstr ""
-#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
msgid "Order in list"
msgstr ""
-#: ../../mod/mitem.php:159 ../../mod/mitem.php:231
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
msgid "Higher numbers will sink to bottom of listing"
msgstr ""
-#: ../../mod/mitem.php:160
+#: ../../mod/mitem.php:162
msgid "Submit and finish"
msgstr ""
-#: ../../mod/mitem.php:161
+#: ../../mod/mitem.php:163
msgid "Submit and continue"
msgstr ""
-#: ../../mod/mitem.php:169
+#: ../../mod/mitem.php:171
msgid "Menu:"
msgstr ""
-#: ../../mod/mitem.php:172
+#: ../../mod/mitem.php:174
msgid "Link Target"
msgstr ""
-#: ../../mod/mitem.php:175
+#: ../../mod/mitem.php:177
msgid "Edit menu"
msgstr ""
-#: ../../mod/mitem.php:178
+#: ../../mod/mitem.php:180
msgid "Edit element"
msgstr ""
-#: ../../mod/mitem.php:179
+#: ../../mod/mitem.php:181
msgid "Drop element"
msgstr ""
-#: ../../mod/mitem.php:180
+#: ../../mod/mitem.php:182
msgid "New element"
msgstr ""
-#: ../../mod/mitem.php:181
+#: ../../mod/mitem.php:183
msgid "Edit this menu container"
msgstr ""
-#: ../../mod/mitem.php:182
+#: ../../mod/mitem.php:184
msgid "Add menu element"
msgstr ""
-#: ../../mod/mitem.php:183
+#: ../../mod/mitem.php:185
msgid "Delete this menu item"
msgstr ""
-#: ../../mod/mitem.php:184
+#: ../../mod/mitem.php:186
msgid "Edit this menu item"
msgstr ""
-#: ../../mod/mitem.php:201
+#: ../../mod/mitem.php:203
msgid "Menu item not found."
msgstr ""
-#: ../../mod/mitem.php:212
+#: ../../mod/mitem.php:215
msgid "Menu item deleted."
msgstr ""
-#: ../../mod/mitem.php:214
+#: ../../mod/mitem.php:217
msgid "Menu item could not be deleted."
msgstr ""
-#: ../../mod/mitem.php:221
+#: ../../mod/mitem.php:224
msgid "Edit Menu Element"
msgstr ""
-#: ../../mod/mitem.php:227
+#: ../../mod/mitem.php:230
msgid "Link text"
msgstr ""
@@ -5621,91 +5621,91 @@ msgstr ""
msgid "Unable to remove source."
msgstr ""
-#: ../../mod/menu.php:44
+#: ../../mod/menu.php:45
msgid "Unable to update menu."
msgstr ""
-#: ../../mod/menu.php:53
+#: ../../mod/menu.php:56
msgid "Unable to create menu."
msgstr ""
-#: ../../mod/menu.php:89 ../../mod/menu.php:101
+#: ../../mod/menu.php:92 ../../mod/menu.php:104
msgid "Menu Name"
msgstr ""
-#: ../../mod/menu.php:89
+#: ../../mod/menu.php:92
msgid "Unique name (not visible on webpage) - required"
msgstr ""
-#: ../../mod/menu.php:90 ../../mod/menu.php:102
+#: ../../mod/menu.php:93 ../../mod/menu.php:105
msgid "Menu Title"
msgstr ""
-#: ../../mod/menu.php:90
+#: ../../mod/menu.php:93
msgid "Visible on webpage - leave empty for no title"
msgstr ""
-#: ../../mod/menu.php:91
+#: ../../mod/menu.php:94
msgid "Allow Bookmarks"
msgstr ""
-#: ../../mod/menu.php:91 ../../mod/menu.php:147
+#: ../../mod/menu.php:94 ../../mod/menu.php:151
msgid "Menu may be used to store saved bookmarks"
msgstr ""
-#: ../../mod/menu.php:92 ../../mod/menu.php:149
+#: ../../mod/menu.php:95 ../../mod/menu.php:153
msgid "Submit and proceed"
msgstr ""
-#: ../../mod/menu.php:104
+#: ../../mod/menu.php:107
msgid "Drop"
msgstr ""
-#: ../../mod/menu.php:108
+#: ../../mod/menu.php:111
msgid "Bookmarks allowed"
msgstr ""
-#: ../../mod/menu.php:110
+#: ../../mod/menu.php:113
msgid "Delete this menu"
msgstr ""
-#: ../../mod/menu.php:111 ../../mod/menu.php:144
+#: ../../mod/menu.php:114 ../../mod/menu.php:148
msgid "Edit menu contents"
msgstr ""
-#: ../../mod/menu.php:112
+#: ../../mod/menu.php:115
msgid "Edit this menu"
msgstr ""
-#: ../../mod/menu.php:126
+#: ../../mod/menu.php:130
msgid "Menu could not be deleted."
msgstr ""
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:143
msgid "Edit Menu"
msgstr ""
-#: ../../mod/menu.php:143
+#: ../../mod/menu.php:147
msgid "Add or remove entries to this menu"
msgstr ""
-#: ../../mod/menu.php:145
+#: ../../mod/menu.php:149
msgid "Menu name"
msgstr ""
-#: ../../mod/menu.php:145
+#: ../../mod/menu.php:149
msgid "Must be unique, only seen by you"
msgstr ""
-#: ../../mod/menu.php:146
+#: ../../mod/menu.php:150
msgid "Menu title"
msgstr ""
-#: ../../mod/menu.php:146
+#: ../../mod/menu.php:150
msgid "Menu title as seen by others"
msgstr ""
-#: ../../mod/menu.php:147
+#: ../../mod/menu.php:151
msgid "Allow bookmarks"
msgstr ""
diff --git a/version.inc b/version.inc
index 763c01a75..95854c9ac 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-10.1151
+2015-09-11.1152