<?php
/**
* @file mod/notifications.php
- * @brief The notifications module
+ * The notifications module
*/
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
-use Friendica\Core\L10n;
-use Friendica\Core\NotificationsManager;
use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
function notifications_post(App $a)
{
if (!local_user()) {
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
}
$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
}
if ($request_id) {
- $intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
-
- if (DBA::isResult($intro)) {
- $intro_id = $intro['id'];
- $contact_id = $intro['contact-id'];
- } else {
- notice(L10n::t('Invalid request identifier.') . EOL);
- return;
+ $intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
+
+ switch ($_POST['submit']) {
+ case DI::l10n()->t('Discard'):
+ $intro->discard();
+ break;
+ case DI::l10n()->t('Ignore'):
+ $intro->ignore();
+ break;
}
- // If it is a friend suggestion, the contact is not a new friend but an existing friend
- // that should not be deleted.
-
- $fid = $intro['fid'];
-
- if ($_POST['submit'] == L10n::t('Discard')) {
- DBA::delete('intro', ['id' => $intro_id]);
-
- if (!$fid) {
- // The check for blocked and pending is in case the friendship was already approved
- // and we just want to get rid of the now pointless notification
- $condition = ['id' => $contact_id, 'uid' => local_user(),
- 'self' => false, 'blocked' => true, 'pending' => true];
- DBA::delete('contact', $condition);
- }
- $a->internalRedirect('notifications/intros');
- }
-
- if ($_POST['submit'] == L10n::t('Ignore')) {
- DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
- $a->internalRedirect('notifications/intros');
- }
+ DI::baseUrl()->redirect('notifications/intros');
}
}
function notifications_content(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return Login::form();
}
- $page = defaults($_REQUEST, 'page', 1);
- $show = defaults($_REQUEST, 'show', 0);
+ $page = ($_REQUEST['page'] ?? 0) ?: 1;
+ $show = ($_REQUEST['show'] ?? '') === 'all';
Nav::setSelected('notifications');
$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
- $nm = new NotificationsManager();
+ $nm = DI::notify();
$o = '';
// Get the nav tabs for the notification pages
$perpage = 20;
$startrec = ($page * $perpage) - $perpage;
- $notif_header = L10n::t('Notifications');
+ $notif_header = DI::l10n()->t('Notifications');
+
+ $all = false;
// Get introductions
if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
Nav::setSelected('introductions');
+ $id = 0;
+ if (!empty($a->argv[2]) && intval($a->argv[2]) != 0) {
+ $id = (int)$a->argv[2];
+ }
+
$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
- $notifs = $nm->introNotifs($all, $startrec, $perpage);
+ $notifs = $nm->getIntroList($all, $startrec, $perpage, $id);
// Get the network notifications
} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
- $notif_header = L10n::t('Network Notifications');
- $notifs = $nm->networkNotifs($show, $startrec, $perpage);
+ $notif_header = DI::l10n()->t('Network Notifications');
+ $notifs = $nm->getNetworkList($show, $startrec, $perpage);
// Get the system notifications
} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
- $notif_header = L10n::t('System Notifications');
- $notifs = $nm->systemNotifs($show, $startrec, $perpage);
+ $notif_header = DI::l10n()->t('System Notifications');
+ $notifs = $nm->getSystemList($show, $startrec, $perpage);
// Get the personal notifications
} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
- $notif_header = L10n::t('Personal Notifications');
- $notifs = $nm->personalNotifs($show, $startrec, $perpage);
+ $notif_header = DI::l10n()->t('Personal Notifications');
+ $notifs = $nm->getPersonalList($show, $startrec, $perpage);
// Get the home notifications
} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
- $notif_header = L10n::t('Home Notifications');
- $notifs = $nm->homeNotifs($show, $startrec, $perpage);
+ $notif_header = DI::l10n()->t('Home Notifications');
+ $notifs = $nm->getHomeList($show, $startrec, $perpage);
+ // fallback - redirect to main page
+ } else {
+ DI::baseUrl()->redirect('notifications');
}
// Set the pager
- $pager = new Pager($a->query_string, $perpage);
+ $pager = new Pager(DI::args()->getQueryString(), $perpage);
// Add additional informations (needed for json output)
$notifs['items_page'] = $pager->getItemsPerPage();
System::jsonExit($notifs);
}
- $notif_tpl = get_markup_template('notifications.tpl');
+ $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
$notif_show_lnk = [
'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
- 'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+ 'text' => ($show ? DI::l10n()->t('Show unread') : DI::l10n()->t('Show all')),
];
// Process the data for template creation
- if (defaults($notifs, 'ident', '') === 'introductions') {
- $sugg = get_markup_template('suggestions.tpl');
- $tpl = get_markup_template('intros.tpl');
+ if (($notifs['ident'] ?? '') == 'introductions') {
+ $sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+ $tpl = Renderer::getMarkupTemplate('intros.tpl');
// The link to switch between ignored and normal connection requests
$notif_show_lnk = [
'href' => (!$all ? 'notifications/intros/all' : 'notifications/intros' ),
- 'text' => (!$all ? L10n::t('Show Ignored Requests') : L10n::t('Hide Ignored Requests'))
+ 'text' => (!$all ? DI::l10n()->t('Show Ignored Requests') : DI::l10n()->t('Hide Ignored Requests'))
];
// Loop through all introduction notifications.This creates an array with the output html for each
// We have to distinguish between these two because they use different data.
switch ($notif['label']) {
case 'friend_suggestion':
- $notif_content[] = replace_macros($sugg, [
+ $notif_content[] = Renderer::replaceMacros($sugg, [
'$type' => $notif['label'],
- '$str_notifytype' => L10n::t('Notification type:'),
+ '$str_notifytype' => DI::l10n()->t('Notification type:'),
'$notify_type'=> $notif['notify_type'],
'$intro_id' => $notif['intro_id'],
- '$lbl_madeby' => L10n::t('Suggested by:'),
+ '$lbl_madeby' => DI::l10n()->t('Suggested by:'),
'$madeby' => $notif['madeby'],
'$madeby_url' => $notif['madeby_url'],
'$madeby_zrl' => $notif['madeby_zrl'],
'$fullname' => $notif['name'],
'$url' => $notif['url'],
'$zrl' => $notif['zrl'],
- '$lbl_url' => L10n::t('Profile URL'),
+ '$lbl_url' => DI::l10n()->t('Profile URL'),
'$addr' => $notif['addr'],
- '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
+ '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
'$knowyou' => $notif['knowyou'],
- '$approve' => L10n::t('Approve'),
+ '$approve' => DI::l10n()->t('Approve'),
'$note' => $notif['note'],
'$request' => $notif['request'],
- '$ignore' => L10n::t('Ignore'),
- '$discard' => L10n::t('Discard'),
+ '$ignore' => DI::l10n()->t('Ignore'),
+ '$discard' => DI::l10n()->t('Discard'),
]);
break;
$helptext3 = '';
if ($notif['network'] === Protocol::DFRN) {
- $lbl_knowyou = L10n::t('Claims to be known to you: ');
- $knowyou = (($notif['knowyou']) ? L10n::t('yes') : L10n::t('no'));
- $helptext = L10n::t('Shall your connection be bidirectional or not?');
- $helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
- $helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
+ $lbl_knowyou = DI::l10n()->t('Claims to be known to you: ');
+ $knowyou = (($notif['knowyou']) ? DI::l10n()->t('yes') : DI::l10n()->t('no'));
+ $helptext = DI::l10n()->t('Shall your connection be bidirectional or not?');
+ $helptext2 = DI::l10n()->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
+ $helptext3 = DI::l10n()->t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
} elseif ($notif['network'] === Protocol::DIASPORA) {
- $helptext = L10n::t('Shall your connection be bidirectional or not?');
- $helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
- $helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
+ $helptext = DI::l10n()->t('Shall your connection be bidirectional or not?');
+ $helptext2 = DI::l10n()->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
+ $helptext3 = DI::l10n()->t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
}
- $dfrn_tpl = get_markup_template('netfriend.tpl');
- $dfrn_text = replace_macros($dfrn_tpl, [
+ $dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl');
+ $dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
'$intro_id' => $notif['intro_id'],
'$friend_selected' => $friend_selected,
'$fan_selected'=> $fan_selected,
'$approve_as1' => $helptext,
'$approve_as2' => $helptext2,
'$approve_as3' => $helptext3,
- '$as_friend' => L10n::t('Friend'),
- '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
+ '$as_friend' => DI::l10n()->t('Friend'),
+ '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? DI::l10n()->t('Sharer') : DI::l10n()->t('Subscriber'))
]);
+ $contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]);
+
+ if (($contact['network'] != Protocol::DFRN) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) {
+ $action = 'follow_confirm';
+ } else {
+ $action = 'dfrn_confirm';
+ }
+
$header = $notif['name'];
if ($notif['addr'] != '') {
$header .= ' (' . ContactSelector::networkToName($notif['network'], $notif['url']) . ')';
if ($notif['network'] != Protocol::DIASPORA) {
- $discard = L10n::t('Discard');
+ $discard = DI::l10n()->t('Discard');
} else {
$discard = '';
}
- $notif_content[] = replace_macros($tpl, [
+ $notif_content[] = Renderer::replaceMacros($tpl, [
'$type' => $notif['label'],
- '$header' => htmlentities($header),
- '$str_notifytype' => L10n::t('Notification type:'),
+ '$header' => $header,
+ '$str_notifytype' => DI::l10n()->t('Notification type:'),
'$notify_type' => $notif['notify_type'],
'$dfrn_text' => $dfrn_text,
'$dfrn_id' => $notif['dfrn_id'],
'$photo' => $notif['photo'],
'$fullname' => $notif['name'],
'$location' => $notif['location'],
- '$lbl_location'=> L10n::t('Location:'),
+ '$lbl_location'=> DI::l10n()->t('Location:'),
'$about' => $notif['about'],
- '$lbl_about' => L10n::t('About:'),
+ '$lbl_about' => DI::l10n()->t('About:'),
'$keywords' => $notif['keywords'],
- '$lbl_keywords'=> L10n::t('Tags:'),
+ '$lbl_keywords'=> DI::l10n()->t('Tags:'),
'$gender' => $notif['gender'],
- '$lbl_gender' => L10n::t('Gender:'),
- '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
+ '$lbl_gender' => DI::l10n()->t('Gender:'),
+ '$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
'$url' => $notif['url'],
'$zrl' => $notif['zrl'],
- '$lbl_url' => L10n::t('Profile URL'),
+ '$lbl_url' => DI::l10n()->t('Profile URL'),
'$addr' => $notif['addr'],
'$lbl_knowyou' => $lbl_knowyou,
- '$lbl_network' => L10n::t('Network:'),
+ '$lbl_network' => DI::l10n()->t('Network:'),
'$network' => ContactSelector::networkToName($notif['network'], $notif['url']),
'$knowyou' => $knowyou,
- '$approve' => L10n::t('Approve'),
+ '$approve' => DI::l10n()->t('Approve'),
'$note' => $notif['note'],
- '$ignore' => L10n::t('Ignore'),
+ '$ignore' => DI::l10n()->t('Ignore'),
'$discard' => $discard,
+ '$action' => $action,
]);
break;
}
}
if (count($notifs['notifications']) == 0) {
- info(L10n::t('No introductions.') . EOL);
+ info(DI::l10n()->t('No introductions.') . EOL);
}
// Normal notifications (no introductions)
'notify' => 'notify.tpl',
];
- $tpl_notif = get_markup_template($notification_templates[$notif['label']]);
+ $tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
- $notif_content[] = replace_macros($tpl_notif, [
+ $notif_content[] = Renderer::replaceMacros($tpl_notif, [
'$item_label' => $notif['label'],
'$item_link' => $notif['link'],
'$item_image' => $notif['image'],
]);
}
} else {
- $notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
+ $notif_nocontent = DI::l10n()->t('No more %s notifications.', $notifs['ident']);
}
- $o .= replace_macros($notif_tpl, [
+ $o .= Renderer::replaceMacros($notif_tpl, [
'$notif_header' => $notif_header,
'$tabs' => $tabs,
'$notif_content' => $notif_content,
projects / friendica.git / blobdiff