use Friendica\Model\Notify\Type;
use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
function message_post(App $a)
{
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return;
}
switch ($ret) {
case -1:
- notice(DI::l10n()->t('No recipient selected.') . EOL);
+ notice(DI::l10n()->t('No recipient selected.'));
$norecip = true;
break;
case -2:
- notice(DI::l10n()->t('Unable to locate contact information.') . EOL);
+ notice(DI::l10n()->t('Unable to locate contact information.'));
break;
case -3:
- notice(DI::l10n()->t('Message could not be sent.') . EOL);
+ notice(DI::l10n()->t('Message could not be sent.'));
break;
case -4:
- notice(DI::l10n()->t('Message collection failure.') . EOL);
+ notice(DI::l10n()->t('Message collection failure.'));
break;
- default:
- info(DI::l10n()->t('Message sent.') . EOL);
}
// fake it to go back to the input form if no recipient listed
Nav::setSelected('messages');
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return Login::form();
}
if ($cmd === 'drop') {
$message = DBA::selectFirst('mail', ['convid'], ['id' => $a->argv[2], 'uid' => local_user()]);
if(!DBA::isResult($message)){
- info(DI::l10n()->t('Conversation not found.') . EOL);
+ notice(DI::l10n()->t('Conversation not found.'));
DI::baseUrl()->redirect('message');
}
- if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
- info(DI::l10n()->t('Message deleted.') . EOL);
+ if (!DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+ notice(DI::l10n()->t('Message was not deleted.'));
}
$conversation = DBA::selectFirst('mail', ['id'], ['convid' => $message['convid'], 'uid' => local_user()]);
if(!DBA::isResult($conversation)){
- info(DI::l10n()->t('Conversation removed.') . EOL);
DI::baseUrl()->redirect('message');
}
if (DBA::isResult($r)) {
$parent = $r[0]['parent-uri'];
- if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
- info(DI::l10n()->t('Conversation removed.') . EOL);
+ if (!DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
+ notice(DI::l10n()->t('Conversation was not removed.'));
}
}
DI::baseUrl()->redirect('message');
$total = $r[0]['total'];
}
- $pager = new Pager(DI::args()->getQueryString());
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
$r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
if (!DBA::isResult($r)) {
- info(DI::l10n()->t('No messages.') . EOL);
+ notice(DI::l10n()->t('No messages.'));
return $o;
}
$messages = DBA::toArray($messages_stmt);
DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
-
- if ($message['convid']) {
- // Clear Diaspora private message notifications
- DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
- }
- // Clear DFRN private message notifications
- DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
+ DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]);
} else {
$messages = false;
}
if (!DBA::isResult($messages)) {
- notice(DI::l10n()->t('Message not available.') . EOL);
+ notice(DI::l10n()->t('Message not available.'));
return $o;
}
$body_e = BBCode::convert($message['body']);
$to_name_e = $message['name'];
- $contact = Contact::getDetailsByURL($message['from-url']);
- if (isset($contact["thumb"])) {
- $from_photo = $contact["thumb"];
- } else {
- $from_photo = $message['from-photo'];
- }
+ $contact = Contact::getByURL($message['from-url'], false, ['thumb', 'addr', 'id', 'avatar']);
+ $from_photo = Contact::getThumb($contact, $message['from-photo']);
$mails[] = [
'id' => $message['id'],
'from_url' => $from_url,
'from_addr' => $contact['addr'],
'sparkle' => $sparkle,
- 'from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
+ 'from_photo' => $from_photo,
'subject' => $subject_e,
'body' => $body_e,
'delete' => DI::l10n()->t('Delete message'),
$body_e = $rr['body'];
$to_name_e = $rr['name'];
- $contact = Contact::getDetailsByURL($rr['url']);
- if (isset($contact["thumb"])) {
- $from_photo = $contact["thumb"];
- } else {
- $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']);
- }
+ $contact = Contact::getByURL($rr['url'], false, ['thumb', 'addr', 'id', 'avatar']);
+ $from_photo = Contact::getThumb($contact, $rr['thumb'] ?: $rr['from-photo']);
$rslt .= Renderer::replaceMacros($tpl, [
'$id' => $rr['id'],
'$from_url' => Contact::magicLink($rr['url']),
'$from_addr' => $contact['addr'] ?? '',
'$sparkle' => ' sparkle',
- '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
+ '$from_photo' => $from_photo,
'$subject' => $rr['title'],
'$delete' => DI::l10n()->t('Delete conversation'),
'$body' => $body_e,