mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-07 15:54:26 +02:00
Rewrite:
- moved constants GRAVITY_* from boot.php to Friendica\Model\Item - also rewrote some array initialization: From: ```` <?php $arr = []; $arr['foo'] = "FOO"; ```` To: ```` <?php $arr['foo'] = "FOO"; ```` - added a few type-hints
This commit is contained in:
Roland Häder
parent
e5ae5c7e67
commit
da66730e4f
77 changed files with 547 additions and 513 deletions
172
mod/message.php
172
mod/message.php
|
|
@ -43,23 +43,23 @@ function message_init(App $a)
|
|||
}
|
||||
|
||||
$new = [
|
||||
'label' => DI::l10n()->t('New Message'),
|
||||
'url' => 'message/new',
|
||||
'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
|
||||
'label' => DI::l10n()->t('New Message'),
|
||||
'url' => 'message/new',
|
||||
'sel' => DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new',
|
||||
'accesskey' => 'm',
|
||||
];
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('message_side.tpl');
|
||||
DI::page()['aside'] = Renderer::replaceMacros($tpl, [
|
||||
'$tabs' => $tabs,
|
||||
'$new' => $new,
|
||||
'$new' => $new,
|
||||
]);
|
||||
$base = DI::baseUrl();
|
||||
|
||||
$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
|
||||
DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
|
||||
'$baseurl' => DI::baseUrl()->get(true),
|
||||
'$base' => $base
|
||||
'$base' => $base
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -83,12 +83,15 @@ function message_post(App $a)
|
|||
notice(DI::l10n()->t('No recipient selected.'));
|
||||
$norecip = true;
|
||||
break;
|
||||
|
||||
case -2:
|
||||
notice(DI::l10n()->t('Unable to locate contact information.'));
|
||||
break;
|
||||
|
||||
case -3:
|
||||
notice(DI::l10n()->t('Message could not be sent.'));
|
||||
break;
|
||||
|
||||
case -4:
|
||||
notice(DI::l10n()->t('Message collection failure.'));
|
||||
break;
|
||||
|
|
@ -118,20 +121,20 @@ function message_content(App $a)
|
|||
if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'new') {
|
||||
$button = [
|
||||
'label' => DI::l10n()->t('Discard'),
|
||||
'url' => '/message',
|
||||
'sel' => 'close',
|
||||
'url' => '/message',
|
||||
'sel' => 'close',
|
||||
];
|
||||
} else {
|
||||
$button = [
|
||||
'label' => DI::l10n()->t('New Message'),
|
||||
'url' => '/message/new',
|
||||
'sel' => 'new',
|
||||
'label' => DI::l10n()->t('New Message'),
|
||||
'url' => '/message/new',
|
||||
'sel' => 'new',
|
||||
'accesskey' => 'm',
|
||||
];
|
||||
}
|
||||
$header = Renderer::replaceMacros($tpl, [
|
||||
'$messages' => DI::l10n()->t('Messages'),
|
||||
'$button' => $button,
|
||||
'$button' => $button,
|
||||
]);
|
||||
|
||||
if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop' || DI::args()->getArgv()[1] === 'dropconv')) {
|
||||
|
|
@ -186,19 +189,19 @@ function message_content(App $a)
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
|
||||
$o .= Renderer::replaceMacros($tpl, [
|
||||
'$header' => DI::l10n()->t('Send Private Message'),
|
||||
'$to' => DI::l10n()->t('To:'),
|
||||
'$subject' => DI::l10n()->t('Subject:'),
|
||||
'$subjtxt' => $_REQUEST['subject'] ?? '',
|
||||
'$text' => $_REQUEST['body'] ?? '',
|
||||
'$readonly' => '',
|
||||
'$yourmessage'=> DI::l10n()->t('Your message:'),
|
||||
'$select' => $select,
|
||||
'$parent' => '',
|
||||
'$upload' => DI::l10n()->t('Upload photo'),
|
||||
'$insert' => DI::l10n()->t('Insert web link'),
|
||||
'$wait' => DI::l10n()->t('Please wait'),
|
||||
'$submit' => DI::l10n()->t('Submit')
|
||||
'$header' => DI::l10n()->t('Send Private Message'),
|
||||
'$to' => DI::l10n()->t('To:'),
|
||||
'$subject' => DI::l10n()->t('Subject:'),
|
||||
'$subjtxt' => $_REQUEST['subject'] ?? '',
|
||||
'$text' => $_REQUEST['body'] ?? '',
|
||||
'$readonly' => '',
|
||||
'$yourmessage' => DI::l10n()->t('Your message:'),
|
||||
'$select' => $select,
|
||||
'$parent' => '',
|
||||
'$upload' => DI::l10n()->t('Upload photo'),
|
||||
'$insert' => DI::l10n()->t('Insert web link'),
|
||||
'$wait' => DI::l10n()->t('Please wait'),
|
||||
'$submit' => DI::l10n()->t('Submit')
|
||||
]);
|
||||
return $o;
|
||||
}
|
||||
|
|
@ -312,18 +315,18 @@ function message_content(App $a)
|
|||
$from_photo = Contact::getThumb($contact);
|
||||
|
||||
$mails[] = [
|
||||
'id' => $message['id'],
|
||||
'from_name' => $from_name_e,
|
||||
'from_url' => $from_url,
|
||||
'from_addr' => $contact['addr'] ?? $from_url,
|
||||
'sparkle' => $sparkle,
|
||||
'id' => $message['id'],
|
||||
'from_name' => $from_name_e,
|
||||
'from_url' => $from_url,
|
||||
'from_addr' => $contact['addr'] ?? $from_url,
|
||||
'sparkle' => $sparkle,
|
||||
'from_photo' => $from_photo,
|
||||
'subject' => $subject_e,
|
||||
'body' => $body_e,
|
||||
'delete' => DI::l10n()->t('Delete message'),
|
||||
'to_name' => $to_name_e,
|
||||
'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
|
||||
'ago' => Temporal::getRelativeDate($message['created']),
|
||||
'subject' => $subject_e,
|
||||
'body' => $body_e,
|
||||
'delete' => DI::l10n()->t('Delete message'),
|
||||
'to_name' => $to_name_e,
|
||||
'date' => DateTimeFormat::local($message['created'], DI::l10n()->t('D, d M Y - g:i A')),
|
||||
'ago' => Temporal::getRelativeDate($message['created']),
|
||||
];
|
||||
|
||||
$seen = $message['seen'];
|
||||
|
|
@ -334,28 +337,27 @@ function message_content(App $a)
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$thread_id' => DI::args()->getArgv()[1],
|
||||
'$thread_id' => DI::args()->getArgv()[1],
|
||||
'$thread_subject' => $message['title'],
|
||||
'$thread_seen' => $seen,
|
||||
'$delete' => DI::l10n()->t('Delete conversation'),
|
||||
'$canreply' => (($unknown) ? false : '1'),
|
||||
'$unknown_text' => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
|
||||
'$mails' => $mails,
|
||||
|
||||
'$thread_seen' => $seen,
|
||||
'$delete' => DI::l10n()->t('Delete conversation'),
|
||||
'$canreply' => (($unknown) ? false : '1'),
|
||||
'$unknown_text' => DI::l10n()->t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
|
||||
'$mails' => $mails,
|
||||
// reply
|
||||
'$header' => DI::l10n()->t('Send Reply'),
|
||||
'$to' => DI::l10n()->t('To:'),
|
||||
'$subject' => DI::l10n()->t('Subject:'),
|
||||
'$subjtxt' => $message['title'],
|
||||
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
|
||||
'$yourmessage' => DI::l10n()->t('Your message:'),
|
||||
'$text' => '',
|
||||
'$select' => $select,
|
||||
'$parent' => $parent,
|
||||
'$upload' => DI::l10n()->t('Upload photo'),
|
||||
'$insert' => DI::l10n()->t('Insert web link'),
|
||||
'$submit' => DI::l10n()->t('Submit'),
|
||||
'$wait' => DI::l10n()->t('Please wait')
|
||||
'$header' => DI::l10n()->t('Send Reply'),
|
||||
'$to' => DI::l10n()->t('To:'),
|
||||
'$subject' => DI::l10n()->t('Subject:'),
|
||||
'$subjtxt' => $message['title'],
|
||||
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
|
||||
'$yourmessage' => DI::l10n()->t('Your message:'),
|
||||
'$text' => '',
|
||||
'$select' => $select,
|
||||
'$parent' => $parent,
|
||||
'$upload' => DI::l10n()->t('Upload photo'),
|
||||
'$insert' => DI::l10n()->t('Insert web link'),
|
||||
'$submit' => DI::l10n()->t('Submit'),
|
||||
'$wait' => DI::l10n()->t('Please wait')
|
||||
]);
|
||||
|
||||
return $o;
|
||||
|
|
@ -368,7 +370,7 @@ function message_content(App $a)
|
|||
* @param int $limit
|
||||
* @return array
|
||||
*/
|
||||
function get_messages(int $uid, int $start, int $limit)
|
||||
function get_messages(int $uid, int $start, int $limit): array
|
||||
{
|
||||
return DBA::toArray(DBA::p('SELECT
|
||||
m.`id`,
|
||||
|
|
@ -392,21 +394,21 @@ function get_messages(int $uid, int $start, int $limit)
|
|||
c.`url`,
|
||||
c.`thumb`,
|
||||
c.`network`,
|
||||
m2.`count`,
|
||||
m2.`mailcreated`,
|
||||
m2.`mailseen`
|
||||
FROM `mail` m
|
||||
JOIN (
|
||||
SELECT
|
||||
`parent-uri`,
|
||||
MIN(`id`) AS `id`,
|
||||
COUNT(*) AS `count`,
|
||||
MAX(`created`) AS `mailcreated`,
|
||||
MIN(`seen`) AS `mailseen`
|
||||
FROM `mail`
|
||||
WHERE `uid` = ?
|
||||
GROUP BY `parent-uri`
|
||||
) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
|
||||
m2.`count`,
|
||||
m2.`mailcreated`,
|
||||
m2.`mailseen`
|
||||
FROM `mail` m
|
||||
JOIN (
|
||||
SELECT
|
||||
`parent-uri`,
|
||||
MIN(`id`) AS `id`,
|
||||
COUNT(*) AS `count`,
|
||||
MAX(`created`) AS `mailcreated`,
|
||||
MIN(`seen`) AS `mailseen`
|
||||
FROM `mail`
|
||||
WHERE `uid` = ?
|
||||
GROUP BY `parent-uri`
|
||||
) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
|
||||
LEFT JOIN `contact` c ON m.`contact-id` = c.`id`
|
||||
WHERE m.`uid` = ?
|
||||
ORDER BY m2.`mailcreated` DESC
|
||||
|
|
@ -414,7 +416,7 @@ function get_messages(int $uid, int $start, int $limit)
|
|||
, $uid, $uid, $start, $limit));
|
||||
}
|
||||
|
||||
function render_messages(array $msg, $t)
|
||||
function render_messages(array $msg, string $t): string
|
||||
{
|
||||
$a = DI::app();
|
||||
|
||||
|
|
@ -444,20 +446,20 @@ function render_messages(array $msg, $t)
|
|||
$from_photo = Contact::getThumb($contact);
|
||||
|
||||
$rslt .= Renderer::replaceMacros($tpl, [
|
||||
'$id' => $rr['id'],
|
||||
'$from_name' => $participants,
|
||||
'$from_url' => Contact::magicLink($rr['url']),
|
||||
'$from_addr' => $contact['addr'] ?? '',
|
||||
'$sparkle' => ' sparkle',
|
||||
'$id' => $rr['id'],
|
||||
'$from_name' => $participants,
|
||||
'$from_url' => Contact::magicLink($rr['url']),
|
||||
'$from_addr' => $contact['addr'] ?? '',
|
||||
'$sparkle' => ' sparkle',
|
||||
'$from_photo' => $from_photo,
|
||||
'$subject' => $rr['title'],
|
||||
'$delete' => DI::l10n()->t('Delete conversation'),
|
||||
'$body' => $body_e,
|
||||
'$to_name' => $to_name_e,
|
||||
'$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
|
||||
'$ago' => Temporal::getRelativeDate($rr['mailcreated']),
|
||||
'$seen' => $rr['mailseen'],
|
||||
'$count' => DI::l10n()->tt('%d message', '%d messages', $rr['count']),
|
||||
'$subject' => $rr['title'],
|
||||
'$delete' => DI::l10n()->t('Delete conversation'),
|
||||
'$body' => $body_e,
|
||||
'$to_name' => $to_name_e,
|
||||
'$date' => DateTimeFormat::local($rr['mailcreated'], DI::l10n()->t('D, d M Y - g:i A')),
|
||||
'$ago' => Temporal::getRelativeDate($rr['mailcreated']),
|
||||
'$seen' => $rr['mailseen'],
|
||||
'$count' => DI::l10n()->tt('%d message', '%d messages', $rr['count']),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue