Merge branch 'dev' into collect

This commit is contained in:
Mike Macgirvin 2024-02-10 09:15:02 +11:00
commit 14291ec1b9
13 changed files with 191 additions and 194 deletions

View file

@ -3717,7 +3717,7 @@ class Activity
if (! $x) {
// This tagged identity has never before been seen on this site. Perform discovery and retry.
/** @noinspection PhpUnusedLocalVariableInspection */
$hash = discover_resource($tag['url']);
$hash = discover_resource($tag['url'], verify: false);
$x = q(
"select * from xchan where xchan_url = '%s' or xchan_hash = '%s' limit 1",
dbesc($tag['url']),

View file

@ -1330,7 +1330,7 @@ class Libzot
);
if (!$r) {
// Author is unknown to this site. Perform channel discovery and try again.
$z = discover_resource($AS->actor['id']);
$z = discover_resource($AS->actor['id'], verify: false);
if ($z) {
$r = q(
"select hubloc_hash, hubloc_network, hubloc_url from hubloc where hubloc_id_url = '%s' and hubloc_deleted = 0",

View file

@ -187,7 +187,7 @@ class Socgraph {
if (($x !== false) && (! count($x))) {
if ($address) {
if (in_array($network, ['nomad', 'zot6', 'activitypub'])) {
$wf = discover_resource($profile_url);
$wf = discover_resource($profile_url, verify: false);
if ($wf) {
$x = q(
"select xchan_hash from xchan where ( xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1",
@ -297,7 +297,7 @@ class Socgraph {
} else {
// We've never seen this person before. Import them.
$wf = discover_resource($entry);
$wf = discover_resource($entry, verify: false);
if ($wf) {
$x = q(
"select xchan_hash from xchan where (xchan_hash = '%s' or xchan_url = '%s') order by xchan_network desc limit 1",

View file

@ -80,16 +80,19 @@ class Zotfinger
}
if ($x['success']) {
if ($verify) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
}
$result['data'] = json_decode($x['body'], true);
if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted', $result['data']) && $result['data']['encrypted']) {
$result['data'] = json_decode(Crypto::unencapsulate($result['data'], get_config('system', 'prvkey')), true);
}
if ($verify) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
}
elseif (!empty($result['data']['public_key'])) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, $result['data']['public_key']);
}
return $result;
}
@ -160,16 +163,18 @@ class Zotfinger
}
if ($x['success']) {
if ($verify) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
}
$result['data'] = json_decode($x['body'], true);
if ($result['data'] && is_array($result['data']) && array_key_exists('encrypted', $result['data']) && $result['data']['encrypted']) {
$result['data'] = json_decode(Crypto::unencapsulate($result['data'], get_config('system', 'prvkey')), true);
}
if ($verify) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, 'zot6');
}
elseif (!empty($result['data']['public_key'])) {
$result['signature'] = HTTPSig::verify($x, EMPTY_STR, $result['data']['public_key']);
}
return $result;
}

View file

@ -17,7 +17,7 @@ class Fedi_id extends Controller
return;
}
if ($_REQUEST['address']) {
$x = discover_resource(trim($_REQUEST['address']));
$x = discover_resource(trim($_REQUEST['address']), verify: false);
if ($x) {
$ab = q(
"select * from abook where abook_xchan = '%s' and abook_channel = %d",

View file

@ -84,7 +84,7 @@ class Linkinfo extends Controller
if (!$m['scheme']) {
if (strpos($url, '@')) {
$xc = discover_resource($url);
$xc = discover_resource($url, verify: false);
if ($xc) {
$x = q(
"select * from xchan where xchan_hash = '%s'",

View file

@ -49,7 +49,7 @@ class Owa extends Controller
dbesc($keyId)
);
if (!$r) {
$found = discover_resource($keyId);
$found = discover_resource($keyId, verify: false);
if ($found) {
$r = q(
"select * from hubloc left join xchan on hubloc_hash = xchan_hash

View file

@ -34,15 +34,11 @@ class HTTPSig
public static function generate_digest_header($body, $alg = 'sha256')
{
$digest = base64_encode(hash($alg, (isset($body) ? $body : ''), true));
switch ($alg) {
case 'sha512':
return 'SHA-512=' . $digest;
case 'sha256':
default:
return 'SHA-256=' . $digest;
break;
}
$digest = base64_encode(hash($alg, ($body ?? ''), true));
return match ($alg) {
'sha512' => 'SHA-512=' . $digest,
default => 'SHA-256=' . $digest,
};
}
@ -74,7 +70,7 @@ class HTTPSig
$headers['content-length'] = $_SERVER['CONTENT_LENGTH'];
foreach ($_SERVER as $k => $v) {
if (strpos($k, 'HTTP_') === 0) {
if (str_starts_with($k, 'HTTP_')) {
$field = str_replace('_', '-', strtolower(substr($k, 5)));
$headers[$field] = $v;
}
@ -159,7 +155,7 @@ class HTTPSig
}
if ($h === 'date') {
$d = new DateTime($headers[$h]);
$d->setTimeZone(new DateTimeZone('UTC'));
$d->setTimezone(new DateTimeZone('UTC'));
$dplus = datetime_convert('UTC', 'UTC', 'now + 1 day');
$dminus = datetime_convert('UTC', 'UTC', 'now - 1 day');
$c = $d->format('Y-m-d H:i:s');
@ -197,10 +193,10 @@ class HTTPSig
if ($sig_block['algorithm'] === 'hs2019') {
if (isset($fkey['algorithm'])) {
if (strpos($fkey['algorithm'], 'rsa-sha256') !== false) {
if (str_contains($fkey['algorithm'], 'rsa-sha256')) {
$algorithm = 'sha256';
}
if (strpos($fkey['algorithm'], 'rsa-sha512') !== false) {
if (str_contains($fkey['algorithm'], 'rsa-sha512')) {
$algorithm = 'sha512';
}
}
@ -287,7 +283,7 @@ class HTTPSig
}
if (strpos($id, '#') === false) {
if (strpbrk($id, '#?') === false) {
$key = self::get_webfinger_key($id, $force);
if ($key) {
return $key;
@ -302,9 +298,9 @@ class HTTPSig
public static function convertKey($key)
{
if (strstr($key, 'RSA ')) {
if (str_contains($key, 'RSA ')) {
return Keyutils::rsatopem($key);
} elseif (substr($key, 0, 5) === 'data:') {
} elseif (str_starts_with($key, 'data:')) {
return Keyutils::convertSalmonKey($key);
} else {
return $key;
@ -316,7 +312,7 @@ class HTTPSig
* @brief
*
* @param string $id
* @return bool|string
* @return bool| array
* false if no pub key found, otherwise return the pub key
*/
@ -423,7 +419,7 @@ class HTTPSig
}
if (in_array($l['rel'], ['http://purl.org/nomad', 'http://purl.org/zot/protocol/6.0']) && array_key_exists('href',$l) && $l['href'] !== EMPTY_STR) {
// The third argument to Zotfinger::exec() tells it not to verify signatures
// The third argument to Zotfinger::exec() tells it not to perfrom network fetches to verify signatures
// Since we're inside a function that is fetching keys with which to verify signatures,
// this is necessary to prevent infinite loops.
@ -489,7 +485,7 @@ class HTTPSig
continue;
}
if (in_array($l['rel'], ['http://purl.org/nomad', 'http://purl.org/zot/protocol/6.0']) && array_key_exists('href',$l) && $l['href'] !== EMPTY_STR) {
// The third argument to Zotfinger::exec() tells it not to verify signatures
// The third argument to Zotfinger::exec() tells it not to perfrom network fetches to verify signatures
// Since we're inside a function that is fetching keys with which to verify signatures,
// this is necessary to prevent infinite loops.

View file

@ -812,7 +812,7 @@ function import_author_activitypub($x) {
return $ptr['xchan_hash'];
}
$z = discover_resource($x['url']);
$z = discover_resource($x['url'], verify: false);
if($z) {
$r = q("select xchan_hash, xchan_url, xchan_network, xchan_name, xchan_photo_s from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' and hubloc_deleted = 0",

View file

@ -732,6 +732,7 @@ function discover_resource(string $resource, $protocol = '', $verify = true)
if ($nomad['success']) {
return $nomad['hash'];
}
return false;
}
}

View file

@ -339,7 +339,7 @@ function owt_init($token)
if (! $r) {
// finger them if they can't be found.
$wf = discover_resource($ob_hash);
$wf = discover_resource($ob_hash, verify: false);
if ($wf) {
$r = q(
"select * from hubloc left join xchan on xchan_hash = hubloc_hash
@ -439,7 +439,7 @@ function observer_auth($ob_hash)
if (! $r) {
// finger them if they can't be found.
$wf = discover_resource($ob_hash);
$wf = discover_resource($ob_hash, verify: false);
if ($wf) {
$r = q(
"select * from hubloc left join xchan on xchan_hash = hubloc_hash

View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 24.01.31\n"
"Project-Id-Version: 24.02.09\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-30 13:43-0800\n"
"POT-Creation-Date: 2024-02-08 13:39-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"
@ -131,7 +131,7 @@ msgstr ""
msgid "Import complete."
msgstr ""
#: Code/Lib/Stringsjs.php:13 include/conversation.php:1153
#: Code/Lib/Stringsjs.php:13 include/conversation.php:1156
msgid "Delete this item?"
msgstr ""
@ -298,12 +298,12 @@ msgid "Pinned"
msgstr ""
#: Code/Lib/Stringsjs.php:42 Code/Lib/ThreadItem.php:485
#: include/conversation.php:611
#: include/conversation.php:614
msgid "Pin this post"
msgstr ""
#: Code/Lib/Stringsjs.php:43 Code/Lib/ThreadItem.php:485
#: include/conversation.php:611
#: include/conversation.php:614
msgid "Unpin this post"
msgstr ""
@ -678,7 +678,7 @@ msgstr ""
msgid "Clients"
msgstr ""
#: Code/Lib/Apps.php:398 include/conversation.php:1305
#: Code/Lib/Apps.php:398 include/conversation.php:1308
msgid "Comment Control"
msgstr ""
@ -991,8 +991,8 @@ msgstr ""
#: Code/Module/Photos.php:1260 Code/Module/Editblock.php:154
#: Code/Module/Editlayout.php:151 Code/Module/Editwebpage.php:185
#: Code/Module/Thing.php:305 Code/Module/Webpages.php:271
#: Code/Storage/Browser.php:319 include/conversation.php:505
#: include/conversation.php:556
#: Code/Storage/Browser.php:319 include/conversation.php:508
#: include/conversation.php:559
msgid "Delete"
msgstr ""
@ -1021,7 +1021,7 @@ msgstr ""
#: Code/Module/Embedphotos.php:343 Code/Module/Photos.php:855
#: Code/Module/Photos.php:1323 Code/Storage/Browser.php:182
#: Code/Widget/Album.php:100 Code/Widget/Portfolio.php:110
#: include/attach.php:1387 include/conversation.php:954
#: include/attach.php:1387 include/conversation.php:957
msgid "Unknown"
msgstr ""
@ -1086,6 +1086,10 @@ msgstr ""
msgid "Account '%s' deleted"
msgstr ""
#: Code/Lib/Libzot.php:778
msgid "Unable to verify channel signature"
msgstr ""
#: Code/Lib/Channel.php:45
msgid "Empty name"
msgstr ""
@ -2090,7 +2094,7 @@ msgstr ""
#: Code/Lib/Libacl.php:147 Code/Lib/ThreadItem.php:513
#: Code/Module/Settings/Channel.php:484 Code/Module/Photos.php:1341
#: include/conversation.php:1366
#: include/conversation.php:1369
msgid "Close"
msgstr ""
@ -2133,14 +2137,14 @@ msgid "Edit visibility"
msgstr ""
#: Code/Lib/Libprofile.php:296 include/connections.php:182
#: include/conversation.php:868
#: include/conversation.php:871
msgid "Direct Message"
msgstr ""
#: Code/Lib/Libprofile.php:309 Code/Module/Directory.php:453
#: Code/Module/Fedi_id.php:55 Code/Widget/Suggestions.php:49
#: Code/Widget/Follow.php:41 include/connections.php:154
#: include/conversation.php:848
#: include/conversation.php:851
msgid "Connect"
msgstr ""
@ -2368,8 +2372,8 @@ msgstr ""
#: extend/addon/a/content_import/Mod_content_import.php:149
#: extend/addon/a/content_import/Mod_content_import.php:150
#: extend/addon/a/content_import/Mod_content_import.php:151
#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1297
#: include/conversation.php:1302 view/theme/redbasic/php/config.php:105
#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1300
#: include/conversation.php:1305 view/theme/redbasic/php/config.php:105
msgid "No"
msgstr ""
@ -2391,8 +2395,8 @@ msgstr ""
#: extend/addon/a/content_import/Mod_content_import.php:149
#: extend/addon/a/content_import/Mod_content_import.php:150
#: extend/addon/a/content_import/Mod_content_import.php:151
#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1297
#: include/conversation.php:1302 view/theme/redbasic/php/config.php:105
#: extend/addon/a/zotpost/Mod_zotpost.php:79 include/conversation.php:1300
#: include/conversation.php:1305 view/theme/redbasic/php/config.php:105
msgid "Yes"
msgstr ""
@ -2432,10 +2436,6 @@ msgstr ""
msgid "Embedded content"
msgstr ""
#: Code/Lib/Libzot.php:778
msgid "Unable to verify channel signature"
msgstr ""
#: Code/Lib/Permcat.php:77
msgctxt "permcat"
msgid "default"
@ -2489,15 +2489,15 @@ msgstr ""
msgid "Any connections including those who haven't yet been approved"
msgstr ""
#: Code/Lib/ThreadItem.php:111 include/conversation.php:513
#: Code/Lib/ThreadItem.php:111 include/conversation.php:516
msgid "Public visibility"
msgstr ""
#: Code/Lib/ThreadItem.php:113 include/conversation.php:515
#: Code/Lib/ThreadItem.php:113 include/conversation.php:518
msgid "Direct message (private mail)"
msgstr ""
#: Code/Lib/ThreadItem.php:116 include/conversation.php:518
#: Code/Lib/ThreadItem.php:116 include/conversation.php:521
msgid "Restricted visibility"
msgstr ""
@ -2512,7 +2512,7 @@ msgid "Admin Delete"
msgstr ""
#: Code/Lib/ThreadItem.php:193 include/attach.php:1381
#: include/conversation.php:504
#: include/conversation.php:507
msgid "Select"
msgstr ""
@ -2542,7 +2542,7 @@ msgid "View all"
msgstr ""
#: Code/Lib/ThreadItem.php:240 Code/Module/Photos.php:1228
#: include/taxonomy.php:754 include/conversation.php:1879
#: include/taxonomy.php:754 include/conversation.php:1882
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@ -2550,13 +2550,13 @@ msgstr[0] ""
msgstr[1] ""
#: Code/Lib/ThreadItem.php:242 Code/Lib/ThreadItem.php:507
#: Code/Module/Photos.php:1335 include/conversation.php:1881
#: Code/Module/Photos.php:1335 include/conversation.php:1884
msgctxt "noun"
msgid "Likes"
msgstr ""
#: Code/Lib/ThreadItem.php:248 Code/Module/Photos.php:1232
#: include/conversation.php:1885
#: include/conversation.php:1888
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@ -2564,7 +2564,7 @@ msgstr[0] ""
msgstr[1] ""
#: Code/Lib/ThreadItem.php:250 Code/Lib/ThreadItem.php:508
#: Code/Module/Photos.php:1336 include/conversation.php:1887
#: Code/Module/Photos.php:1336 include/conversation.php:1890
msgctxt "noun"
msgid "Dislikes"
msgstr ""
@ -2576,11 +2576,11 @@ msgstr ""
msgid "Save"
msgstr ""
#: Code/Lib/ThreadItem.php:280 include/conversation.php:523
#: Code/Lib/ThreadItem.php:280 include/conversation.php:526
msgid "Message signature validated"
msgstr ""
#: Code/Lib/ThreadItem.php:281 include/conversation.php:524
#: Code/Lib/ThreadItem.php:281 include/conversation.php:527
msgid "Message signature incorrect"
msgstr ""
@ -2637,7 +2637,7 @@ msgstr ""
msgid "to"
msgstr ""
#: Code/Lib/ThreadItem.php:423 include/conversation.php:587
#: Code/Lib/ThreadItem.php:423 include/conversation.php:590
msgid "via"
msgstr ""
@ -2649,17 +2649,17 @@ msgstr ""
msgid "via Wall-To-Wall:"
msgstr ""
#: Code/Lib/ThreadItem.php:439 include/conversation.php:590
#: Code/Lib/ThreadItem.php:439 include/conversation.php:593
#, php-format
msgid "from %s"
msgstr ""
#: Code/Lib/ThreadItem.php:442 include/conversation.php:593
#: Code/Lib/ThreadItem.php:442 include/conversation.php:596
#, php-format
msgid "last edited: %s"
msgstr ""
#: Code/Lib/ThreadItem.php:443 include/conversation.php:594
#: Code/Lib/ThreadItem.php:443 include/conversation.php:597
#, php-format
msgid "Expires: %s"
msgstr ""
@ -2684,7 +2684,7 @@ msgstr ""
msgid "Reply"
msgstr ""
#: Code/Lib/ThreadItem.php:483 include/conversation.php:609
#: Code/Lib/ThreadItem.php:483 include/conversation.php:612
msgid "Pinned post"
msgstr ""
@ -2704,16 +2704,16 @@ msgstr ""
msgid "Mark all seen"
msgstr ""
#: Code/Lib/ThreadItem.php:516 include/conversation.php:346
#: Code/Lib/ThreadItem.php:516 include/conversation.php:349
msgid "This is an unsaved preview"
msgstr ""
#: Code/Lib/ThreadItem.php:517 Code/Module/Photos.php:1172
#: include/conversation.php:614
#: include/conversation.php:617
msgid "Please wait"
msgstr ""
#: Code/Lib/ThreadItem.php:911 include/conversation.php:1253
#: Code/Lib/ThreadItem.php:911 include/conversation.php:1256
msgid "Save draft"
msgstr ""
@ -2722,23 +2722,23 @@ msgstr ""
msgid "This is you"
msgstr ""
#: Code/Lib/ThreadItem.php:930 include/conversation.php:1272
#: Code/Lib/ThreadItem.php:930 include/conversation.php:1275
msgid "Bold"
msgstr ""
#: Code/Lib/ThreadItem.php:931 include/conversation.php:1273
#: Code/Lib/ThreadItem.php:931 include/conversation.php:1276
msgid "Italic"
msgstr ""
#: Code/Lib/ThreadItem.php:932 include/conversation.php:1274
#: Code/Lib/ThreadItem.php:932 include/conversation.php:1277
msgid "Underline"
msgstr ""
#: Code/Lib/ThreadItem.php:933 include/conversation.php:1275
#: Code/Lib/ThreadItem.php:933 include/conversation.php:1278
msgid "Quote"
msgstr ""
#: Code/Lib/ThreadItem.php:934 include/conversation.php:1276
#: Code/Lib/ThreadItem.php:934 include/conversation.php:1279
msgid "Code"
msgstr ""
@ -2750,11 +2750,11 @@ msgstr ""
msgid "Attach/Embed File"
msgstr ""
#: Code/Lib/ThreadItem.php:937 include/conversation.php:1277
#: Code/Lib/ThreadItem.php:937 include/conversation.php:1280
msgid "Attach file from your device"
msgstr ""
#: Code/Lib/ThreadItem.php:938 include/conversation.php:1093
#: Code/Lib/ThreadItem.php:938 include/conversation.php:1096
msgid "Attach file from your personal cloud"
msgstr ""
@ -2768,7 +2768,7 @@ msgstr ""
#: Code/Lib/ThreadItem.php:941 Code/Module/Photos.php:1192
#: Code/Module/Events.php:526 Code/Module/Webpages.php:276
#: include/conversation.php:1159
#: include/conversation.php:1162
msgid "Preview"
msgstr ""
@ -2778,7 +2778,7 @@ msgid "Reset"
msgstr ""
#: Code/Lib/ThreadItem.php:947 Code/Module/Chat.php:222
#: include/conversation.php:1358
#: include/conversation.php:1361
msgid "Encrypt text"
msgstr ""
@ -2962,7 +2962,7 @@ msgid "No registrations."
msgstr ""
#: Code/Module/Admin/Accounts.php:190 Code/Module/Connections.php:364
#: include/conversation.php:555
#: include/conversation.php:558
msgid "Approve"
msgstr ""
@ -3118,9 +3118,9 @@ msgstr ""
#: Code/Module/Editpost.php:183 Code/Module/Editwebpage.php:187
#: Code/Module/Fbrowser.php:75 Code/Module/Fbrowser.php:98
#: Code/Module/Profile_photo.php:518 Code/Module/Tagrm.php:21
#: Code/Module/Tagrm.php:152 include/conversation.php:1289
#: include/conversation.php:1361 include/conversation.php:1363
#: include/conversation.php:1365
#: Code/Module/Tagrm.php:152 include/conversation.php:1292
#: include/conversation.php:1364 include/conversation.php:1366
#: include/conversation.php:1368
msgid "Cancel"
msgstr ""
@ -5881,7 +5881,7 @@ msgstr ""
msgid "Software updates are available."
msgstr ""
#: Code/Module/Admin.php:177 include/conversation.php:1372
#: Code/Module/Admin.php:177 include/conversation.php:1375
msgid "Summary"
msgstr ""
@ -6050,7 +6050,7 @@ msgstr ""
#: Code/Module/Layouts.php:210 Code/Module/Blocks.php:174
#: Code/Module/Photos.php:1171 Code/Module/Webpages.php:270
#: Code/Widget/Cdav.php:147 include/conversation.php:1255
#: Code/Widget/Cdav.php:147 include/conversation.php:1258
msgid "Share"
msgstr ""
@ -6313,7 +6313,7 @@ msgid "Invalid item."
msgstr ""
#: Code/Module/Block.php:49 Code/Module/Cal.php:63 Code/Module/Card_edit.php:56
#: Code/Module/Chanview.php:106 Code/Module/Page.php:85
#: Code/Module/Chanview.php:76 Code/Module/Page.php:85
#: Code/Module/Superblock.php:44 Code/Module/Wall_upload.php:37
#: include/items.php:4139
msgid "Channel not found."
@ -6540,13 +6540,13 @@ msgstr ""
#: Code/Module/Card_edit.php:112 Code/Module/Chat.php:223
#: Code/Module/Editblock.php:131 Code/Module/Editwebpage.php:161
#: include/conversation.php:1088
#: include/conversation.php:1091
msgid "Insert web link"
msgstr ""
#: Code/Module/Card_edit.php:128 Code/Module/Photos.php:732
#: Code/Module/Photos.php:1119 Code/Module/Editblock.php:144
#: include/conversation.php:1315
#: include/conversation.php:1318
msgid "Title (optional)"
msgstr ""
@ -6889,31 +6889,31 @@ msgid ""
"possibly other common richtext constructs."
msgstr ""
#: Code/Module/Chanview.php:148 Code/Module/Chanview.php:149
#: Code/Module/Chanview.php:118 Code/Module/Chanview.php:119
msgid "Not available"
msgstr ""
#: Code/Module/Chanview.php:168
#: Code/Module/Chanview.php:138
msgid "Cover photo for this channel"
msgstr ""
#: Code/Module/Chanview.php:170
#: Code/Module/Chanview.php:140
msgid "Followers"
msgstr ""
#: Code/Module/Chanview.php:171
#: Code/Module/Chanview.php:141
msgid "Following"
msgstr ""
#: Code/Module/Chanview.php:174 include/conversation.php:818
#: Code/Module/Chanview.php:144 include/conversation.php:821
msgid "Visit"
msgstr ""
#: Code/Module/Chanview.php:176
#: Code/Module/Chanview.php:146
msgid "View Recent"
msgstr ""
#: Code/Module/Chanview.php:178
#: Code/Module/Chanview.php:148
msgid "toggle full screen mode"
msgstr ""
@ -7034,7 +7034,7 @@ msgstr ""
msgid "I am online"
msgstr ""
#: Code/Module/Chat.php:221 include/conversation.php:1141
#: Code/Module/Chat.php:221 include/conversation.php:1144
msgid "Please enter a link URL:"
msgstr ""
@ -7694,7 +7694,7 @@ msgstr ""
msgid "Fetch updated photo"
msgstr ""
#: Code/Module/Connedit.php:586 include/conversation.php:838
#: Code/Module/Connedit.php:586 include/conversation.php:841
msgid "Recent Activity"
msgstr ""
@ -8049,8 +8049,8 @@ msgid "Use a photo from your albums"
msgstr ""
#: Code/Module/Cover_photo.php:425 Code/Module/Profile_photo.php:519
#: include/conversation.php:1290 include/conversation.php:1360
#: include/conversation.php:1362 include/conversation.php:1364
#: include/conversation.php:1293 include/conversation.php:1363
#: include/conversation.php:1365 include/conversation.php:1367
msgid "OK"
msgstr ""
@ -8273,27 +8273,27 @@ msgstr ""
msgid "Flag as adult in album view"
msgstr ""
#: Code/Module/Photos.php:1207 include/conversation.php:432
#: Code/Module/Photos.php:1207 include/conversation.php:435
msgctxt "title"
msgid "Likes"
msgstr ""
#: Code/Module/Photos.php:1208 include/conversation.php:433
#: Code/Module/Photos.php:1208 include/conversation.php:436
msgctxt "title"
msgid "Dislikes"
msgstr ""
#: Code/Module/Photos.php:1209 include/conversation.php:434
#: Code/Module/Photos.php:1209 include/conversation.php:437
msgctxt "title"
msgid "Attending"
msgstr ""
#: Code/Module/Photos.php:1210 include/conversation.php:435
#: Code/Module/Photos.php:1210 include/conversation.php:438
msgctxt "title"
msgid "Not attending"
msgstr ""
#: Code/Module/Photos.php:1211 include/conversation.php:436
#: Code/Module/Photos.php:1211 include/conversation.php:439
msgctxt "title"
msgid "Might attend"
msgstr ""
@ -8755,7 +8755,7 @@ msgstr ""
msgid "Edit Location"
msgstr ""
#: Code/Module/Events.php:527 include/conversation.php:1319
#: Code/Module/Events.php:527 include/conversation.php:1322
msgid "Permission settings"
msgstr ""
@ -11204,11 +11204,6 @@ msgstr ""
msgid "Zotpost Settings"
msgstr ""
#: include/dba/dba_driver.php:190
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
#: include/api_auth.php:160
msgid "This API method requires authentication."
msgstr ""
@ -11654,11 +11649,6 @@ msgstr ""
msgid "Upload New Photos"
msgstr ""
#: include/zid.php:416
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr ""
#: include/conversation.php:111
#, php-format
msgid "%1$s repeated %2$s's %3$s"
@ -11693,317 +11683,322 @@ msgstr ""
msgid "poked"
msgstr ""
#: include/conversation.php:509
#: include/conversation.php:512
msgid "Toggle Star Status"
msgstr ""
#: include/conversation.php:559
#: include/conversation.php:562
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
#: include/conversation.php:582
#: include/conversation.php:585
msgid "Categories:"
msgstr ""
#: include/conversation.php:583
#: include/conversation.php:586
msgid "Filed under:"
msgstr ""
#: include/conversation.php:612
#: include/conversation.php:615
msgid "View Conversation"
msgstr ""
#: include/conversation.php:693
#: include/conversation.php:696
msgid "remove"
msgstr ""
#: include/conversation.php:697
#: include/conversation.php:700
msgid "Loading..."
msgstr ""
#: include/conversation.php:698
#: include/conversation.php:701
msgid "Delete Selected Items"
msgstr ""
#: include/conversation.php:712
#: include/conversation.php:715
msgid "View source"
msgstr ""
#: include/conversation.php:722
#: include/conversation.php:725
msgid "Follow thread"
msgstr ""
#: include/conversation.php:731
#: include/conversation.php:734
msgid "Unfollow thread"
msgstr ""
#: include/conversation.php:805
#: include/conversation.php:808
msgid "Remote Search"
msgstr ""
#: include/conversation.php:828
#: include/conversation.php:831
msgid "Nearby"
msgstr ""
#: include/conversation.php:858
#: include/conversation.php:861
msgid "Edit Connection"
msgstr ""
#: include/conversation.php:888
#: include/conversation.php:891
msgid "Block author's site"
msgstr ""
#: include/conversation.php:895
#: include/conversation.php:898
msgid "Block author"
msgstr ""
#: include/conversation.php:1063
#: include/conversation.php:1066
msgid "Set your location"
msgstr ""
#: include/conversation.php:1064
#: include/conversation.php:1067
msgid "Clear your location"
msgstr ""
#: include/conversation.php:1094
#: include/conversation.php:1097
msgid "Attach/Embed file"
msgstr ""
#: include/conversation.php:1095
#: include/conversation.php:1098
msgid "Insert File"
msgstr ""
#: include/conversation.php:1096
#: include/conversation.php:1099
msgid "from device"
msgstr ""
#: include/conversation.php:1097
#: include/conversation.php:1100
msgid "from personal cloud"
msgstr ""
#: include/conversation.php:1142
#: include/conversation.php:1145
msgid "Tag term:"
msgstr ""
#: include/conversation.php:1143
#: include/conversation.php:1146
msgid "Where are you right now?"
msgstr ""
#: include/conversation.php:1143
#: include/conversation.php:1146
msgid "(Enter a dot . to use your current device coordinates.)"
msgstr ""
#: include/conversation.php:1146
#: include/conversation.php:1149
msgid "Choose files to embed"
msgstr ""
#: include/conversation.php:1147
#: include/conversation.php:1150
msgid "Choose a folder"
msgstr ""
#: include/conversation.php:1148
#: include/conversation.php:1151
msgid "Choose a different folder..."
msgstr ""
#: include/conversation.php:1149
#: include/conversation.php:1152
msgid "Error getting folder list"
msgstr ""
#: include/conversation.php:1150
#: include/conversation.php:1153
msgid "Error getting file link"
msgstr ""
#: include/conversation.php:1151
#: include/conversation.php:1154
msgid "Error getting folder"
msgstr ""
#: include/conversation.php:1209
#: include/conversation.php:1212
msgid "Restricted - from connections only"
msgstr ""
#: include/conversation.php:1210
#: include/conversation.php:1213
msgid "Semi-public - from anybody that can be identified"
msgstr ""
#: include/conversation.php:1211
#: include/conversation.php:1214
msgid "Public - from anybody on the internet"
msgstr ""
#: include/conversation.php:1227
#: include/conversation.php:1230
msgid "Accept delivery of comments on this post from"
msgstr ""
#: include/conversation.php:1266
#: include/conversation.php:1269
msgid "Page link name"
msgstr ""
#: include/conversation.php:1269
#: include/conversation.php:1272
msgid "Post as"
msgstr ""
#: include/conversation.php:1271
#: include/conversation.php:1274
msgid "Text styles"
msgstr ""
#: include/conversation.php:1279
#: include/conversation.php:1282
msgid "Please enter a link location (URL)"
msgstr ""
#: include/conversation.php:1281
#: include/conversation.php:1284
msgid "Insert link only"
msgstr ""
#: include/conversation.php:1281
#: include/conversation.php:1284
msgid "Embed content if possible"
msgstr ""
#: include/conversation.php:1286
#: include/conversation.php:1289
msgid "Embed a file from the cloud"
msgstr ""
#: include/conversation.php:1288
#: include/conversation.php:1291
msgid "Embed an image from your albums"
msgstr ""
#: include/conversation.php:1292
#: include/conversation.php:1295
msgid "Location options"
msgstr ""
#: include/conversation.php:1293
#: include/conversation.php:1296
msgid "Toggle poll"
msgstr ""
#: include/conversation.php:1294
#: include/conversation.php:1297
msgid "Option"
msgstr ""
#: include/conversation.php:1295
#: include/conversation.php:1298
msgid "Add option"
msgstr ""
#: include/conversation.php:1296
#: include/conversation.php:1299
msgid "Minutes"
msgstr ""
#: include/conversation.php:1296
#: include/conversation.php:1299
msgid "Hours"
msgstr ""
#: include/conversation.php:1296
#: include/conversation.php:1299
msgid "Days"
msgstr ""
#: include/conversation.php:1297
#: include/conversation.php:1300
msgid "Allow multiple answers"
msgstr ""
#: include/conversation.php:1300
#: include/conversation.php:1303
msgid "Disable comments"
msgstr ""
#: include/conversation.php:1301
#: include/conversation.php:1304
msgid "Toggle comments"
msgstr ""
#: include/conversation.php:1302
#: include/conversation.php:1305
msgid "Allow comments on this post"
msgstr ""
#: include/conversation.php:1307
#: include/conversation.php:1310
msgid "Optional: disable comments after (date)"
msgstr ""
#: include/conversation.php:1318
#: include/conversation.php:1321
msgid "Categories (optional, comma-separated list)"
msgstr ""
#: include/conversation.php:1342
#: include/conversation.php:1345
msgid "Other networks and post services"
msgstr ""
#: include/conversation.php:1343
#: include/conversation.php:1346
msgid "Collections"
msgstr ""
#: include/conversation.php:1348
#: include/conversation.php:1351
msgid "Check In"
msgstr ""
#: include/conversation.php:1349
#: include/conversation.php:1352
msgid "Check Out"
msgstr ""
#: include/conversation.php:1350
#: include/conversation.php:1353
msgid "Set expiration date"
msgstr ""
#: include/conversation.php:1355
#: include/conversation.php:1358
msgid "Set publish date"
msgstr ""
#: include/conversation.php:1373
#: include/conversation.php:1376
msgid "Load remote media players"
msgstr ""
#: include/conversation.php:1374
#: include/conversation.php:1377
msgid "This <em>may</em> subject viewers of this post to behaviour tracking"
msgstr ""
#: include/conversation.php:1376
#: include/conversation.php:1379
msgid "Find shareable objects"
msgstr ""
#: include/conversation.php:1405
#: include/conversation.php:1408
msgid "Post to Collections"
msgstr ""
#: include/conversation.php:1782
#: include/conversation.php:1785
msgid " distance: "
msgstr ""
#: include/conversation.php:1890
#: include/conversation.php:1893
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
#: include/conversation.php:1892
#: include/conversation.php:1895
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
#: include/conversation.php:1894
#: include/conversation.php:1897
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
#: include/conversation.php:1896
#: include/conversation.php:1899
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
#: include/conversation.php:1898
#: include/conversation.php:1901
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
#: include/conversation.php:1900
#: include/conversation.php:1903
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
#: include/zid.php:416
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr ""
#: include/event.php:37 include/event.php:123
msgid "l F d, Y \\@ g:i A"
msgstr ""

View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.01.31');
define ('STD_VERSION', '24.02.09');