clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11266 from annando/display-permissions 

Display the post receivers
This commit is contained in:
Hypolite Petovan 2022-02-20 15:59:16 -05:00 committed by GitHub
parent c86cc83524 cec9c6d1a6
commit bed1139093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 233 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Database/PostUpdate.php
View File

@ -1039,7 +1039,8 @@ class PostUpdate
Logger::info('Start', ['uri-id' => $id]); Logger::info('Start', ['uri-id' => $id]);
$start_id = $id; $start_id = $id;
$rows = 0; $rows = 0;
$received = '';
$conversations = DBA::p("SELECT `post-view`.`uri-id`, `conversation`.`source`, `conversation`.`received` FROM `conversation` $conversations = DBA::p("SELECT `post-view`.`uri-id`, `conversation`.`source`, `conversation`.`received` FROM `conversation`
INNER JOIN `post-view` ON `post-view`.`uri` = `conversation`.`item-uri` INNER JOIN `post-view` ON `post-view`.`uri` = `conversation`.`item-uri`

60
src/Module/PermissionTooltip.php
View File

@ -25,8 +25,8 @@ use Friendica\Core\Hook;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
/** /**
@ -46,7 +46,7 @@ class PermissionTooltip extends \Friendica\BaseModule
$condition = ['id' => $referenceId]; $condition = ['id' => $referenceId];
if ($type == 'item') { if ($type == 'item') {
$fields = ['uid', 'psid', 'private']; $fields = ['uid', 'psid', 'private', 'uri-id'];
$model = Post::selectFirst($fields, $condition); $model = Post::selectFirst($fields, $condition);
} else { } else {
$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']; $fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
@ -72,13 +72,18 @@ class PermissionTooltip extends \Friendica\BaseModule
// Kept for backwards compatiblity // Kept for backwards compatiblity
Hook::callAll('lockview_content', $model); Hook::callAll('lockview_content', $model);
if ($type == 'item') {
$receivers = $this->fetchReceivers($model['uri-id']);
} else {
$receivers = '';
}
if ($model['uid'] != local_user() || if ($model['uid'] != local_user() ||
isset($model['private']) empty($model['allow_cid'])
&& $model['private'] == Item::PRIVATE
&& empty($model['allow_cid'])
&& empty($model['allow_gid']) && empty($model['allow_gid'])
&& empty($model['deny_cid']) && empty($model['deny_cid'])
&& empty($model['deny_gid'])) && empty($model['deny_gid'])
&& empty($receivers))
{ {
echo DI::l10n()->t('Remote privacy information not available.'); echo DI::l10n()->t('Remote privacy information not available.');
exit; exit;
@ -136,7 +141,48 @@ class PermissionTooltip extends \Friendica\BaseModule
$l[] = '<strike>' . $contact['name'] . '</strike>'; $l[] = '<strike>' . $contact['name'] . '</strike>';
} }
echo $o . implode(', ', $l); if (!empty($l)) {
echo $o . implode(', ', $l);
} else {
echo $o . $receivers;
}
exit(); exit();
} }
/**
* Fetch a list of receivers
*
* @param int $uriId
* @return string
*/
private function fetchReceivers(int $uriId):string
{
// We only fetch "to" and "cc", because "bcc" should never be displayed
$receivers = [];
foreach (Tag::getByURIId($uriId, [Tag::TO, Tag::CC]) as $receiver) {
$receivers[$receiver['type']][] = $receiver['name'];
}
$output = '';
foreach ($receivers as $type => $receiver) {
$max = DI::config()->get('system', 'max_receivers');
$total = count($receiver);
if ($total > $max) {
$receiver = array_slice($receiver, 0, $max);
$receiver[] = DI::l10n()->t('%d more', $total - $max);
}
switch ($type) {
case Tag::TO:
$output .= DI::l10n()->t('<b>To:</b> %s<br>', implode(', ', $receiver));
break;
case Tag::CC:
$output .= DI::l10n()->t('<b>CC:</b> %s<br>', implode(', ', $receiver));
break;
}
}
return $output;
}
} }

34
src/Object/Post.php
View File

@ -121,6 +121,29 @@ class Post
} }
} }
/**
* Fetch the privacy of the post
*
* @param array $item
* @return string
*/
private function fetchPrivacy(array $item):string
{
switch ($item['private']) {
case Item::PRIVATE:
$output = DI::l10n()->t('Private Message');
break;
case Item::PUBLIC:
$output = DI::l10n()->t('Public Message');
break;
case Item::UNLISTED:
$output = DI::l10n()->t('Unlisted Message');
break;
}
return $output;
}
/** /**
* Get data in a form usable by a conversation template * Get data in a form usable by a conversation template
* *
@ -170,12 +193,9 @@ class Post
$conv = $this->getThread(); $conv = $this->getThread();
$lock = ((($item['private'] == Item::PRIVATE) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) $privacy = $this->fetchPrivacy($item);
|| strlen($item['deny_cid']) || strlen($item['deny_gid'])))) $lock = ($item['private'] == Item::PRIVATE) ? $privacy : false;
? DI::l10n()->t('Private Message') $connector = !in_array($item['network'], Protocol::NATIVE_SUPPORT) ? DI::l10n()->t('Connector Message') : false;
: false);
$connector = !$item['global'] ? DI::l10n()->t('Connector Message') : false;
$shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != Item::PRIVATE; $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != Item::PRIVATE;
$announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]); $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]);
@ -463,6 +483,8 @@ class Post
'app' => $item['app'], 'app' => $item['app'],
'created' => $ago, 'created' => $ago,
'lock' => $lock, 'lock' => $lock,
'private' => $item['private'],
'privacy' => $privacy,
'connector' => $connector, 'connector' => $connector,
'location_html' => $location_html, 'location_html' => $location_html,
'indent' => $indent, 'indent' => $indent,

4
static/settings.config.php
View File

@ -140,6 +140,10 @@ return [
// If you don't want to set a maximum length, set to -1. // If you don't want to set a maximum length, set to -1.
'max_image_length' => -1, 'max_image_length' => -1,
// max_receivers (Integer)
// The maximum number of displayed receivers of posts
'max_receivers' => 10,
// maximagesize (Integer) // maximagesize (Integer)
// Maximum size in bytes of an uploaded photo. // Maximum size in bytes of an uploaded photo.
'maximagesize' => 800000, 'maximagesize' => 800000,

239
view/lang/C/messages.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.05-dev\n" "Project-Id-Version: 2022.05-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-19 13:54+0000\n" "POT-Creation-Date: 2022-02-20 20:50+0000\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"
@ -163,7 +163,7 @@ msgid "Save"
msgstr "" msgstr ""
#: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:326 #: mod/editpost.php:92 mod/photos.php:1344 src/Content/Conversation.php:326
#: src/Module/Contact/Poke.php:176 src/Object/Post.php:960 #: src/Module/Contact/Poke.php:176 src/Object/Post.php:982
msgid "Loading..." msgid "Loading..."
msgstr "" msgstr ""
@ -229,7 +229,7 @@ msgstr ""
#: mod/editpost.php:107 mod/message.php:200 mod/message.php:358 #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358
#: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:355 #: mod/photos.php:1495 mod/wallmessage.php:142 src/Content/Conversation.php:355
#: src/Content/Conversation.php:690 src/Module/Item/Compose.php:165 #: src/Content/Conversation.php:690 src/Module/Item/Compose.php:165
#: src/Object/Post.php:498 #: src/Object/Post.php:520
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -261,7 +261,7 @@ msgstr ""
#: mod/editpost.php:128 mod/events.php:517 mod/photos.php:1343 #: mod/editpost.php:128 mod/events.php:517 mod/photos.php:1343
#: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:370 #: mod/photos.php:1399 mod/photos.php:1473 src/Content/Conversation.php:370
#: src/Module/Item/Compose.php:160 src/Object/Post.php:970 #: src/Module/Item/Compose.php:160 src/Object/Post.php:992
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
@ -273,37 +273,37 @@ msgid "Cancel"
msgstr "" msgstr ""
#: mod/editpost.php:134 src/Content/Conversation.php:331 #: mod/editpost.php:134 src/Content/Conversation.php:331
#: src/Module/Item/Compose.php:151 src/Object/Post.php:961 #: src/Module/Item/Compose.php:151 src/Object/Post.php:983
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: mod/editpost.php:135 src/Content/Conversation.php:332 #: mod/editpost.php:135 src/Content/Conversation.php:332
#: src/Module/Item/Compose.php:152 src/Object/Post.php:962 #: src/Module/Item/Compose.php:152 src/Object/Post.php:984
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: mod/editpost.php:136 src/Content/Conversation.php:333 #: mod/editpost.php:136 src/Content/Conversation.php:333
#: src/Module/Item/Compose.php:153 src/Object/Post.php:963 #: src/Module/Item/Compose.php:153 src/Object/Post.php:985
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: mod/editpost.php:137 src/Content/Conversation.php:334 #: mod/editpost.php:137 src/Content/Conversation.php:334
#: src/Module/Item/Compose.php:154 src/Object/Post.php:964 #: src/Module/Item/Compose.php:154 src/Object/Post.php:986
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: mod/editpost.php:138 src/Content/Conversation.php:335 #: mod/editpost.php:138 src/Content/Conversation.php:335
#: src/Module/Item/Compose.php:155 src/Object/Post.php:965 #: src/Module/Item/Compose.php:155 src/Object/Post.php:987
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: mod/editpost.php:139 src/Content/Conversation.php:337 #: mod/editpost.php:139 src/Content/Conversation.php:337
#: src/Module/Item/Compose.php:157 src/Object/Post.php:967 #: src/Module/Item/Compose.php:157 src/Object/Post.php:989
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: mod/editpost.php:140 src/Content/Conversation.php:338 #: mod/editpost.php:140 src/Content/Conversation.php:338
#: src/Module/Item/Compose.php:158 src/Object/Post.php:968 #: src/Module/Item/Compose.php:158 src/Object/Post.php:990
msgid "Link or Media" msgid "Link or Media"
msgstr "" msgstr ""
@ -411,7 +411,7 @@ msgstr ""
#: src/Module/Install.php:252 src/Module/Install.php:294 #: src/Module/Install.php:252 src/Module/Install.php:294
#: src/Module/Install.php:331 src/Module/Invite.php:177 #: src/Module/Install.php:331 src/Module/Invite.php:177
#: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247
#: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:959 #: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:981
#: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
#: view/theme/quattro/config.php:71 view/theme/vier/config.php:119 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
msgid "Submit" msgid "Submit"
@ -1066,16 +1066,16 @@ msgstr ""
#: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469 #: mod/photos.php:1339 mod/photos.php:1395 mod/photos.php:1469
#: src/Module/Contact.php:544 src/Module/Item/Compose.php:148 #: src/Module/Contact.php:544 src/Module/Item/Compose.php:148
#: src/Object/Post.php:956 #: src/Object/Post.php:978
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471 #: mod/photos.php:1341 mod/photos.php:1397 mod/photos.php:1471
#: src/Object/Post.php:492 src/Object/Post.php:958 #: src/Object/Post.php:514 src/Object/Post.php:980
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: mod/photos.php:1430 src/Content/Conversation.php:615 src/Object/Post.php:227 #: mod/photos.php:1430 src/Content/Conversation.php:615 src/Object/Post.php:247
msgid "Select" msgid "Select"
msgstr "" msgstr ""
@ -1085,19 +1085,19 @@ msgstr ""
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: mod/photos.php:1492 src/Object/Post.php:349 #: mod/photos.php:1492 src/Object/Post.php:369
msgid "Like" msgid "Like"
msgstr "" msgstr ""
#: mod/photos.php:1493 src/Object/Post.php:349 #: mod/photos.php:1493 src/Object/Post.php:369
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: mod/photos.php:1494 src/Object/Post.php:350 #: mod/photos.php:1494 src/Object/Post.php:370
msgid "Dislike" msgid "Dislike"
msgstr "" msgstr ""
#: mod/photos.php:1496 src/Object/Post.php:350 #: mod/photos.php:1496 src/Object/Post.php:370
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
@ -1465,7 +1465,7 @@ msgstr ""
msgid "Unable to find your profile. Please contact your admin." msgid "Unable to find your profile. Please contact your admin."
msgstr "" msgstr ""
#: mod/settings.php:664 src/Content/Widget.php:526 #: mod/settings.php:664 src/Content/Widget.php:523
msgid "Account Types" msgid "Account Types"
msgstr "" msgstr ""
@ -2157,8 +2157,8 @@ msgid "All contacts"
msgstr "" msgstr ""
#: src/BaseModule.php:409 src/Content/Widget.php:231 src/Core/ACL.php:193 #: src/BaseModule.php:409 src/Content/Widget.php:231 src/Core/ACL.php:193
#: src/Module/Contact.php:367 src/Module/PermissionTooltip.php:98 #: src/Module/Contact.php:367 src/Module/PermissionTooltip.php:103
#: src/Module/PermissionTooltip.php:120 #: src/Module/PermissionTooltip.php:125
msgid "Followers" msgid "Followers"
msgstr "" msgstr ""
@ -2484,7 +2484,7 @@ msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: src/Content/Conversation.php:308 src/Module/Item/Compose.php:159 #: src/Content/Conversation.php:308 src/Module/Item/Compose.php:159
#: src/Object/Post.php:969 #: src/Object/Post.php:991
msgid "Please enter a image/video/audio/webpage URL:" msgid "Please enter a image/video/audio/webpage URL:"
msgstr "" msgstr ""
@ -2508,12 +2508,12 @@ msgstr ""
msgid "New Post" msgid "New Post"
msgstr "" msgstr ""
#: src/Content/Conversation.php:325 src/Object/Post.php:475 #: src/Content/Conversation.php:325 src/Object/Post.php:497
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: src/Content/Conversation.php:336 src/Module/Item/Compose.php:156 #: src/Content/Conversation.php:336 src/Module/Item/Compose.php:156
#: src/Object/Post.php:966 #: src/Object/Post.php:988
msgid "Image" msgid "Image"
msgstr "" msgstr ""
@ -2525,21 +2525,21 @@ msgstr ""
msgid "Scheduled at" msgid "Scheduled at"
msgstr "" msgstr ""
#: src/Content/Conversation.php:651 src/Object/Post.php:448 #: src/Content/Conversation.php:651 src/Object/Post.php:468
#: src/Object/Post.php:449 #: src/Object/Post.php:469
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: src/Content/Conversation.php:664 src/Object/Post.php:436 #: src/Content/Conversation.php:664 src/Object/Post.php:456
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:665 src/Object/Post.php:437 #: src/Content/Conversation.php:665 src/Object/Post.php:457
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: src/Content/Conversation.php:673 src/Object/Post.php:462 #: src/Content/Conversation.php:673 src/Object/Post.php:482
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
@ -2699,7 +2699,7 @@ msgid "Display membership date in profile"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:145 src/Content/Nav.php:239 #: src/Content/ForumManager.php:145 src/Content/Nav.php:239
#: src/Content/Text/HTML.php:896 src/Content/Widget.php:523 #: src/Content/Text/HTML.php:896 src/Content/Widget.php:520
msgid "Forums" msgid "Forums"
msgstr "" msgstr ""
@ -2707,12 +2707,12 @@ msgstr ""
msgid "External link to forum" msgid "External link to forum"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:150 src/Content/Widget.php:502 #: src/Content/ForumManager.php:150 src/Content/Widget.php:499
msgid "show less" msgid "show less"
msgstr "" msgstr ""
#: src/Content/ForumManager.php:151 src/Content/Widget.php:404 #: src/Content/ForumManager.php:151 src/Content/Widget.php:401
#: src/Content/Widget.php:503 #: src/Content/Widget.php:500
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -2772,7 +2772,7 @@ msgstr ""
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
#: src/Content/Item.php:443 src/Object/Post.php:423 #: src/Content/Item.php:443 src/Object/Post.php:443
msgid "Languages" msgid "Languages"
msgstr "" msgstr ""
@ -3171,7 +3171,7 @@ msgstr ""
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: src/Content/Widget.php:207 src/Model/Group.php:508 #: src/Content/Widget.php:207 src/Model/Group.php:570
#: src/Module/Contact.php:354 src/Module/Welcome.php:76 #: src/Module/Contact.php:354 src/Module/Welcome.php:76
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
@ -3201,38 +3201,38 @@ msgstr ""
msgid "Saved Folders" msgid "Saved Folders"
msgstr "" msgstr ""
#: src/Content/Widget.php:311 src/Content/Widget.php:345 #: src/Content/Widget.php:311 src/Content/Widget.php:342
msgid "Everything" msgid "Everything"
msgstr "" msgstr ""
#: src/Content/Widget.php:343 #: src/Content/Widget.php:340
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: src/Content/Widget.php:400 #: src/Content/Widget.php:397
#, php-format #, php-format
msgid "%d contact in common" msgid "%d contact in common"
msgid_plural "%d contacts in common" msgid_plural "%d contacts in common"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Content/Widget.php:496 #: src/Content/Widget.php:493
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
#: src/Content/Widget.php:520 #: src/Content/Widget.php:517
msgid "Persons" msgid "Persons"
msgstr "" msgstr ""
#: src/Content/Widget.php:521 #: src/Content/Widget.php:518
msgid "Organisations" msgid "Organisations"
msgstr "" msgstr ""
#: src/Content/Widget.php:522 src/Model/Contact.php:1472 #: src/Content/Widget.php:519 src/Model/Contact.php:1472
msgid "News" msgid "News"
msgstr "" msgstr ""
#: src/Content/Widget.php:527 src/Module/Admin/BaseUsers.php:51 #: src/Content/Widget.php:524 src/Module/Admin/BaseUsers.php:51
msgid "All" msgid "All"
msgstr "" msgstr ""
@ -3305,8 +3305,8 @@ msgstr ""
msgid "Yourself" msgid "Yourself"
msgstr "" msgstr ""
#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:104 #: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:109
#: src/Module/PermissionTooltip.php:126 #: src/Module/PermissionTooltip.php:131
msgid "Mutuals" msgid "Mutuals"
msgstr "" msgstr ""
@ -4208,40 +4208,40 @@ msgid ""
"not what you intended, please create another group with a different name." "not what you intended, please create another group with a different name."
msgstr "" msgstr ""
#: src/Model/Group.php:424 #: src/Model/Group.php:486
msgid "Default privacy group for new contacts" msgid "Default privacy group for new contacts"
msgstr "" msgstr ""
#: src/Model/Group.php:456 #: src/Model/Group.php:518
msgid "Everybody" msgid "Everybody"
msgstr "" msgstr ""
#: src/Model/Group.php:475 #: src/Model/Group.php:537
msgid "edit" msgid "edit"
msgstr "" msgstr ""
#: src/Model/Group.php:507 #: src/Model/Group.php:569
msgid "add" msgid "add"
msgstr "" msgstr ""
#: src/Model/Group.php:512 #: src/Model/Group.php:574
msgid "Edit group" msgid "Edit group"
msgstr "" msgstr ""
#: src/Model/Group.php:513 src/Module/Group.php:194 #: src/Model/Group.php:575 src/Module/Group.php:194
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: src/Model/Group.php:515 #: src/Model/Group.php:577
msgid "Create a new group" msgid "Create a new group"
msgstr "" msgstr ""
#: src/Model/Group.php:516 src/Module/Group.php:179 src/Module/Group.php:202 #: src/Model/Group.php:578 src/Module/Group.php:179 src/Module/Group.php:202
#: src/Module/Group.php:277 #: src/Module/Group.php:277
msgid "Group Name: " msgid "Group Name: "
msgstr "" msgstr ""
#: src/Model/Group.php:517 #: src/Model/Group.php:579
msgid "Edit groups" msgid "Edit groups"
msgstr "" msgstr ""
@ -7095,7 +7095,7 @@ msgid "Only show blocked contacts"
msgstr "" msgstr ""
#: src/Module/Contact.php:330 src/Module/Contact.php:377 #: src/Module/Contact.php:330 src/Module/Contact.php:377
#: src/Object/Post.php:309 #: src/Object/Post.php:329
msgid "Ignored" msgid "Ignored"
msgstr "" msgstr ""
@ -7646,7 +7646,7 @@ msgstr ""
msgid "Posts that mention or involve you" msgid "Posts that mention or involve you"
msgstr "" msgstr ""
#: src/Module/Conversation/Network.php:277 src/Object/Post.php:321 #: src/Module/Conversation/Network.php:277 src/Object/Post.php:341
msgid "Starred" msgid "Starred"
msgstr "" msgstr ""
@ -8568,14 +8568,29 @@ msgstr ""
msgid "Model not found" msgid "Model not found"
msgstr "" msgstr ""
#: src/Module/PermissionTooltip.php:83 #: src/Module/PermissionTooltip.php:88
msgid "Remote privacy information not available." msgid "Remote privacy information not available."
msgstr "" msgstr ""
#: src/Module/PermissionTooltip.php:92 #: src/Module/PermissionTooltip.php:97
msgid "Visible to:" msgid "Visible to:"
msgstr "" msgstr ""
#: src/Module/PermissionTooltip.php:174
#, php-format
msgid "%d more"
msgstr ""
#: src/Module/PermissionTooltip.php:178
#, php-format
msgid "<b>To:</b> %s<br>"
msgstr ""
#: src/Module/PermissionTooltip.php:181
#, php-format
msgid "<b>CC:</b> %s<br>"
msgstr ""
#: src/Module/Photo.php:123 #: src/Module/Photo.php:123
msgid "The Photo is not available." msgid "The Photo is not available."
msgstr "" msgstr ""
@ -10397,193 +10412,201 @@ msgstr ""
msgid "%s posted an update." msgid "%s posted an update."
msgstr "" msgstr ""
#: src/Object/Post.php:147 #: src/Object/Post.php:134
msgid "This entry was edited"
msgstr ""
#: src/Object/Post.php:175
msgid "Private Message" msgid "Private Message"
msgstr "" msgstr ""
#: src/Object/Post.php:178 #: src/Object/Post.php:137
msgid "Public Message"
msgstr ""
#: src/Object/Post.php:140
msgid "Unlisted Message"
msgstr ""
#: src/Object/Post.php:170
msgid "This entry was edited"
msgstr ""
#: src/Object/Post.php:198
msgid "Connector Message" msgid "Connector Message"
msgstr "" msgstr ""
#: src/Object/Post.php:193 src/Object/Post.php:195 #: src/Object/Post.php:213 src/Object/Post.php:215
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: src/Object/Post.php:215 #: src/Object/Post.php:235
msgid "Pinned item" msgid "Pinned item"
msgstr "" msgstr ""
#: src/Object/Post.php:219 #: src/Object/Post.php:239
msgid "Delete globally" msgid "Delete globally"
msgstr "" msgstr ""
#: src/Object/Post.php:219 #: src/Object/Post.php:239
msgid "Remove locally" msgid "Remove locally"
msgstr "" msgstr ""
#: src/Object/Post.php:235 #: src/Object/Post.php:255
#, php-format #, php-format
msgid "Block %s" msgid "Block %s"
msgstr "" msgstr ""
#: src/Object/Post.php:240 #: src/Object/Post.php:260
msgid "Save to folder" msgid "Save to folder"
msgstr "" msgstr ""
#: src/Object/Post.php:274 #: src/Object/Post.php:294
msgid "I will attend" msgid "I will attend"
msgstr "" msgstr ""
#: src/Object/Post.php:274 #: src/Object/Post.php:294
msgid "I will not attend" msgid "I will not attend"
msgstr "" msgstr ""
#: src/Object/Post.php:274 #: src/Object/Post.php:294
msgid "I might attend" msgid "I might attend"
msgstr "" msgstr ""
#: src/Object/Post.php:304 #: src/Object/Post.php:324
msgid "Ignore thread" msgid "Ignore thread"
msgstr "" msgstr ""
#: src/Object/Post.php:305 #: src/Object/Post.php:325
msgid "Unignore thread" msgid "Unignore thread"
msgstr "" msgstr ""
#: src/Object/Post.php:306 #: src/Object/Post.php:326
msgid "Toggle ignore status" msgid "Toggle ignore status"
msgstr "" msgstr ""
#: src/Object/Post.php:316 #: src/Object/Post.php:336
msgid "Add star" msgid "Add star"
msgstr "" msgstr ""
#: src/Object/Post.php:317 #: src/Object/Post.php:337
msgid "Remove star" msgid "Remove star"
msgstr "" msgstr ""
#: src/Object/Post.php:318 #: src/Object/Post.php:338
msgid "Toggle star status" msgid "Toggle star status"
msgstr "" msgstr ""
#: src/Object/Post.php:329 #: src/Object/Post.php:349
msgid "Pin" msgid "Pin"
msgstr "" msgstr ""
#: src/Object/Post.php:330 #: src/Object/Post.php:350
msgid "Unpin" msgid "Unpin"
msgstr "" msgstr ""
#: src/Object/Post.php:331 #: src/Object/Post.php:351
msgid "Toggle pin status" msgid "Toggle pin status"
msgstr "" msgstr ""
#: src/Object/Post.php:334 #: src/Object/Post.php:354
msgid "Pinned" msgid "Pinned"
msgstr "" msgstr ""
#: src/Object/Post.php:339 #: src/Object/Post.php:359
msgid "Add tag" msgid "Add tag"
msgstr "" msgstr ""
#: src/Object/Post.php:352 #: src/Object/Post.php:372
msgid "Quote share this" msgid "Quote share this"
msgstr "" msgstr ""
#: src/Object/Post.php:352 #: src/Object/Post.php:372
msgid "Quote Share" msgid "Quote Share"
msgstr "" msgstr ""
#: src/Object/Post.php:355 #: src/Object/Post.php:375
msgid "Reshare this" msgid "Reshare this"
msgstr "" msgstr ""
#: src/Object/Post.php:355 #: src/Object/Post.php:375
msgid "Reshare" msgid "Reshare"
msgstr "" msgstr ""
#: src/Object/Post.php:356 #: src/Object/Post.php:376
msgid "Cancel your Reshare" msgid "Cancel your Reshare"
msgstr "" msgstr ""
#: src/Object/Post.php:356 #: src/Object/Post.php:376
msgid "Unshare" msgid "Unshare"
msgstr "" msgstr ""
#: src/Object/Post.php:401 #: src/Object/Post.php:421
#, php-format #, php-format
msgid "%s (Received %s)" msgid "%s (Received %s)"
msgstr "" msgstr ""
#: src/Object/Post.php:406 #: src/Object/Post.php:426
msgid "Comment this item on your system" msgid "Comment this item on your system"
msgstr "" msgstr ""
#: src/Object/Post.php:406 #: src/Object/Post.php:426
msgid "Remote comment" msgid "Remote comment"
msgstr "" msgstr ""
#: src/Object/Post.php:450 #: src/Object/Post.php:470
msgid "to" msgid "to"
msgstr "" msgstr ""
#: src/Object/Post.php:451 #: src/Object/Post.php:471
msgid "via" msgid "via"
msgstr "" msgstr ""
#: src/Object/Post.php:452 #: src/Object/Post.php:472
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: src/Object/Post.php:453 #: src/Object/Post.php:473
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
#: src/Object/Post.php:493 #: src/Object/Post.php:515
#, php-format #, php-format
msgid "Reply to %s" msgid "Reply to %s"
msgstr "" msgstr ""
#: src/Object/Post.php:496 #: src/Object/Post.php:518
msgid "More" msgid "More"
msgstr "" msgstr ""
#: src/Object/Post.php:514 #: src/Object/Post.php:536
msgid "Notifier task is pending" msgid "Notifier task is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:515 #: src/Object/Post.php:537
msgid "Delivery to remote servers is pending" msgid "Delivery to remote servers is pending"
msgstr "" msgstr ""
#: src/Object/Post.php:516 #: src/Object/Post.php:538
msgid "Delivery to remote servers is underway" msgid "Delivery to remote servers is underway"
msgstr "" msgstr ""
#: src/Object/Post.php:517 #: src/Object/Post.php:539
msgid "Delivery to remote servers is mostly done" msgid "Delivery to remote servers is mostly done"
msgstr "" msgstr ""
#: src/Object/Post.php:518 #: src/Object/Post.php:540
msgid "Delivery to remote servers is done" msgid "Delivery to remote servers is done"
msgstr "" msgstr ""
#: src/Object/Post.php:538 #: src/Object/Post.php:560
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Object/Post.php:539 #: src/Object/Post.php:561
msgid "Show more" msgid "Show more"
msgstr "" msgstr ""
#: src/Object/Post.php:540 #: src/Object/Post.php:562
msgid "Show fewer" msgid "Show fewer"
msgstr "" msgstr ""

5
view/theme/frio/css/style.css
View File

@ -1757,8 +1757,7 @@ blockquote.shared_content {
font-weight: 500; font-weight: 500;
color: $font_color_darker; color: $font_color_darker;
} }
.media .media-body .addional-info a, .media .media-body .addional-info a {
.media .media-body h5.media-heading > a {
display: block; display: block;
} }
.media .contact-info-comment { .media .contact-info-comment {
@ -1769,7 +1768,7 @@ blockquote.shared_content {
margin: 0 0 5px; margin: 0 0 5px;
} }
.media-heading { .media-heading {
margin: 0 0 5px; margin: 0px;
} }
.wall-item-name, .wall-item-name,
.shared-author { .shared-author {

19
view/theme/frio/templates/wall_thread.tpl
View File

@ -158,12 +158,12 @@ as the value of $top_child_total (this is done at the end of this file)
<span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span> <span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
</a> </a>
{{/if}} {{/if}}
{{if $item.lock}} {{if $item.connector}}
<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip"> <small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small> {{else}}
<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
&nbsp;<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
</span> </span>
{{elseif $item.connector}}
<small><i class="fa fa-lock" title="{{$item.connector}}"></i></small>
{{/if}} {{/if}}
</h4> </h4>
@ -221,7 +221,15 @@ as the value of $top_child_total (this is done at the end of this file)
<div class="contact-info-comment"> <div class="contact-info-comment">
<h5 class="media-heading"> <h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
{{if $item.connector}}
<small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
{{else}}
<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
&nbsp;<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
</span>
{{/if}}
<span class="text-muted"> <span class="text-muted">
</h5>
<small> <small>
<a href="{{$item.plink.orig}}"> <a href="{{$item.plink.orig}}">
<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time> <time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
@ -235,7 +243,6 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}} {{/if}}
</small> </small>
</span> </span>
</h5>
</div> </div>
{{/if}} {{* End of if $item.thread_level != 1 *}} {{/if}} {{* End of if $item.thread_level != 1 *}}
</div> </div>