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

Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications 

Fix empty notifications
This commit is contained in:
Tobias Diekershoff 2018-09-07 07:33:47 +02:00 committed by GitHub
parent 480d792356 f85af78097
commit 55f72b5767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 107 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
mod/notifications.php
View File

@ -21,7 +21,7 @@ function notifications_post(App $a)
$request_id = (($a->argc > 1) ? $a->argv[1] : 0); $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
if ($request_id === "all") { if ($request_id === 'all') {
return; return;
} }
@ -68,8 +68,8 @@ function notifications_content(App $a)
return; return;
} }
$page = (x($_REQUEST,'page') ? $_REQUEST['page'] : 1); $page = defaults($_REQUEST, 'page', 1);
$show = (x($_REQUEST,'show') ? $_REQUEST['show'] : 0); $show = defaults($_REQUEST, 'show', 0);
Nav::setSelected('notifications'); Nav::setSelected('notifications');
@ -118,7 +118,6 @@ function notifications_content(App $a)
$notifs = $nm->homeNotifs($show, $startrec, $perpage); $notifs = $nm->homeNotifs($show, $startrec, $perpage);
} }
// Set the pager // Set the pager
$a->set_pager_itemspage($perpage); $a->set_pager_itemspage($perpage);
@ -136,7 +135,7 @@ function notifications_content(App $a)
// Process the data for template creation // Process the data for template creation
if (defaults($notifs, 'ident', '') === 'introductions') { if (defaults($notifs, 'ident', '') === 'introductions') {
$sugg = get_markup_template('suggestions.tpl'); $sugg = get_markup_template('suggestions.tpl');
$tpl = get_markup_template("intros.tpl"); $tpl = get_markup_template('intros.tpl');
// The link to switch between ignored and normal connection requests // The link to switch between ignored and normal connection requests
$notif_show_lnk = [ $notif_show_lnk = [
@ -146,127 +145,121 @@ function notifications_content(App $a)
// Loop through all introduction notifications.This creates an array with the output html for each // Loop through all introduction notifications.This creates an array with the output html for each
// introduction // introduction
foreach ($notifs['notifications'] as $it) { foreach ($notifs['notifications'] as $notif) {
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
// We have to distinguish between these two because they use different data. // We have to distinguish between these two because they use different data.
switch ($it['label']) { switch ($notif['label']) {
case 'friend_suggestion': case 'friend_suggestion':
$notif_content[] = replace_macros($sugg, [ $notif_content[] = replace_macros($sugg, [
'$type' => $it['label'], '$type' => $notif['label'],
'$str_notifytype' => L10n::t('Notification type:'), '$str_notifytype' => L10n::t('Notification type:'),
'$notify_type' => $it['notify_type'], '$notify_type'=> $notif['notify_type'],
'$intro_id' => $it['intro_id'], '$intro_id' => $notif['intro_id'],
'$lbl_madeby' => L10n::t('Suggested by:'), '$lbl_madeby' => L10n::t('Suggested by:'),
'$madeby' => $it['madeby'], '$madeby' => $notif['madeby'],
'$madeby_url' => $it['madeby_url'], '$madeby_url' => $notif['madeby_url'],
'$madeby_zrl' => $it['madeby_zrl'], '$madeby_zrl' => $notif['madeby_zrl'],
'$madeby_addr' => $it['madeby_addr'], '$madeby_addr'=> $notif['madeby_addr'],
'$contact_id' => $it['contact_id'], '$contact_id' => $notif['contact_id'],
'$photo' => $it['photo'], '$photo' => $notif['photo'],
'$fullname' => $it['name'], '$fullname' => $notif['name'],
'$url' => $it['url'], '$url' => $notif['url'],
'$zrl' => $it['zrl'], '$zrl' => $notif['zrl'],
'$lbl_url' => L10n::t('Profile URL'), '$lbl_url' => L10n::t('Profile URL'),
'$addr' => $it['addr'], '$addr' => $notif['addr'],
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''], '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
'$knowyou' => $notif['knowyou'],
'$knowyou' => $it['knowyou'], '$approve' => L10n::t('Approve'),
'$approve' => L10n::t('Approve'), '$note' => $notif['note'],
'$note' => $it['note'], '$request' => $notif['request'],
'$request' => $it['request'], '$ignore' => L10n::t('Ignore'),
'$ignore' => L10n::t('Ignore'), '$discard' => L10n::t('Discard'),
'$discard' => L10n::t('Discard'),
]); ]);
break; break;
// Normal connection requests // Normal connection requests
default: default:
$friend_selected = (($it['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled '); $friend_selected = (($notif['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
$fan_selected = (($it['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : ''); $fan_selected = (($notif['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
$dfrn_tpl = get_markup_template('netfriend.tpl');
$knowyou = '';
$lbl_knowyou = ''; $lbl_knowyou = '';
$dfrn_text = ''; $knowyou = '';
$helptext = ''; $helptext = '';
$helptext2 = ''; $helptext2 = '';
$helptext3 = ''; $helptext3 = '';
if ($it['network'] === Protocol::DFRN || $it['network'] === Protocol::DIASPORA) { if ($notif['network'] === Protocol::DFRN) {
if ($it['network'] === Protocol::DFRN) { $lbl_knowyou = L10n::t('Claims to be known to you: ');
$lbl_knowyou = L10n::t('Claims to be known to you: '); $knowyou = (($notif['knowyou']) ? L10n::t('yes') : L10n::t('no'));
$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no')); $helptext = L10n::t('Shall your connection be bidirectional or not?');
$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']);
$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.', $it['name'], $it['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']);
$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.', $it['name']); } elseif ($notif['network'] === Protocol::DIASPORA) {
} else { $helptext = L10n::t('Shall your connection be bidirectional or not?');
$knowyou = ''; $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']);
$helptext = L10n::t('Shall your connection be bidirectional or not?'); $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']);
$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.', $it['name'], $it['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.', $it['name']);
}
} }
$dfrn_text = replace_macros($dfrn_tpl,[ $dfrn_tpl = get_markup_template('netfriend.tpl');
'$intro_id' => $it['intro_id'], $dfrn_text = replace_macros($dfrn_tpl, [
'$intro_id' => $notif['intro_id'],
'$friend_selected' => $friend_selected, '$friend_selected' => $friend_selected,
'$fan_selected' => $fan_selected, '$fan_selected'=> $fan_selected,
'$approve_as1' => $helptext, '$approve_as1' => $helptext,
'$approve_as2' => $helptext2, '$approve_as2' => $helptext2,
'$approve_as3' => $helptext3, '$approve_as3' => $helptext3,
'$as_friend' => L10n::t('Friend'), '$as_friend' => L10n::t('Friend'),
'$as_fan' => (($it['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber')) '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
]); ]);
$header = $it["name"]; $header = $notif['name'];
if ($it["addr"] != "") { if ($notif['addr'] != '') {
$header .= " <".$it["addr"].">"; $header .= ' <' . $notif['addr'] . '>';
} }
$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")"; $header .= ' (' . ContactSelector::networkToName($notif['network'], $notif['url']) . ')';
if ($it['network'] != Protocol::DIASPORA) { if ($notif['network'] != Protocol::DIASPORA) {
$discard = L10n::t('Discard'); $discard = L10n::t('Discard');
} else { } else {
$discard = ''; $discard = '';
} }
$notif_content[] = replace_macros($tpl, [ $notif_content[] = replace_macros($tpl, [
'$type' => $it['label'], '$type' => $notif['label'],
'$header' => htmlentities($header), '$header' => htmlentities($header),
'$str_notifytype' => L10n::t('Notification type:'), '$str_notifytype' => L10n::t('Notification type:'),
'$notify_type' => $it['notify_type'], '$notify_type' => $notif['notify_type'],
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,
'$dfrn_id' => $it['dfrn_id'], '$dfrn_id' => $notif['dfrn_id'],
'$uid' => $it['uid'], '$uid' => $notif['uid'],
'$intro_id' => $it['intro_id'], '$intro_id' => $notif['intro_id'],
'$contact_id' => $it['contact_id'], '$contact_id' => $notif['contact_id'],
'$photo' => $it['photo'], '$photo' => $notif['photo'],
'$fullname' => $it['name'], '$fullname' => $notif['name'],
'$location' => $it['location'], '$location' => $notif['location'],
'$lbl_location' => L10n::t('Location:'), '$lbl_location'=> L10n::t('Location:'),
'$about' => $it['about'], '$about' => $notif['about'],
'$lbl_about' => L10n::t('About:'), '$lbl_about' => L10n::t('About:'),
'$keywords' => $it['keywords'], '$keywords' => $notif['keywords'],
'$lbl_keywords' => L10n::t('Tags:'), '$lbl_keywords'=> L10n::t('Tags:'),
'$gender' => $it['gender'], '$gender' => $notif['gender'],
'$lbl_gender' => L10n::t('Gender:'), '$lbl_gender' => L10n::t('Gender:'),
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''], '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
'$url' => $it['url'], '$url' => $notif['url'],
'$zrl' => $it['zrl'], '$zrl' => $notif['zrl'],
'$lbl_url' => L10n::t('Profile URL'), '$lbl_url' => L10n::t('Profile URL'),
'$addr' => $it['addr'], '$addr' => $notif['addr'],
'$lbl_knowyou' => $lbl_knowyou, '$lbl_knowyou' => $lbl_knowyou,
'$lbl_network' => L10n::t('Network:'), '$lbl_network' => L10n::t('Network:'),
'$network' => ContactSelector::networkToName($it['network'], $it['url']), '$network' => ContactSelector::networkToName($notif['network'], $notif['url']),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => L10n::t('Approve'), '$approve' => L10n::t('Approve'),
'$note' => $it['note'], '$note' => $notif['note'],
'$ignore' => L10n::t('Ignore'), '$ignore' => L10n::t('Ignore'),
'$discard' => $discard, '$discard' => $discard,
]); ]);
break; break;
} }
@ -276,57 +269,42 @@ function notifications_content(App $a)
info(L10n::t('No introductions.') . EOL); info(L10n::t('No introductions.') . EOL);
} }
// Normal notifications (no introductions) // Normal notifications (no introductions)
} elseif (!empty($notifs['notifications'])) { } elseif (!empty($notifs['notifications'])) {
// The template files we need in different cases for formatting the content
$tpl_item_like = 'notifications_likes_item.tpl';
$tpl_item_dislike = 'notifications_dislikes_item.tpl';
$tpl_item_attend = 'notifications_attend_item.tpl';
$tpl_item_attendno = 'notifications_attend_item.tpl';
$tpl_item_attendmaybe = 'notifications_attend_item.tpl';
$tpl_item_friend = 'notifications_friends_item.tpl';
$tpl_item_comment = 'notifications_comments_item.tpl';
$tpl_item_post = 'notifications_posts_item.tpl';
$tpl_item_notify = 'notify.tpl';
// Loop trough ever notification This creates an array with the output html for each // Loop trough ever notification This creates an array with the output html for each
// notification and apply the correct template according to the notificationtype (label). // notification and apply the correct template according to the notificationtype (label).
foreach ($notifs['notifications'] as $it) { foreach ($notifs['notifications'] as $notif) {
// We use the notification label to get the correct template file // We use the notification label to get the correct template file
$tpl_var_name = 'tpl_item_'.$it['label']; $tpl_var_name = 'tpl_item_' . $notif['label'];
$tpl_notif = get_markup_template($$tpl_var_name); $tpl_notif = get_markup_template($$tpl_var_name);
$notif_content[] = replace_macros($tpl_notif,[ $notif_content[] = replace_macros($tpl_notif, [
'$item_label' => $it['label'], '$item_label' => $notif['label'],
'$item_link' => $it['link'], '$item_link' => $notif['link'],
'$item_image' => $it['image'], '$item_image' => $notif['image'],
'$item_url' => $it['url'], '$item_url' => $notif['url'],
'$item_text' => $it['text'], '$item_text' => $notif['text'],
'$item_when' => $it['when'], '$item_when' => $notif['when'],
'$item_ago' => $it['ago'], '$item_ago' => $notif['ago'],
'$item_seen' => $it['seen'], '$item_seen' => $notif['seen'],
]); ]);
} }
} else {
$notif_show_lnk = [ $notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
];
// Output if there aren't any notifications available
if (count($notifs['notifications']) == 0) {
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
}
} }
$notif_show_lnk = [
'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
];
$o .= replace_macros($notif_tpl, [ $o .= replace_macros($notif_tpl, [
'$notif_header' => $notif_header, '$notif_header' => $notif_header,
'$tabs' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
'$notif_nocontent' => $notif_nocontent, '$notif_nocontent' => $notif_nocontent,
'$notif_show_lnk' => $notif_show_lnk, '$notif_show_lnk' => $notif_show_lnk,
'$notif_paginate' => alt_pager($a, count($notif_content)) '$notif_paginate' => alt_pager($a, count($notif_content))
]); ]);
return $o; return $o;