Ensure *toArray returns an array

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index c2dc1cd4c5362903cef35971005a279bbbb4532c..8bc9a76c388efcaef89d1c787579d6a68a047700 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -92,6 +92,8 @@ function notifications_content(App $a)
 
        $notif_header = L10n::t('Notifications');
 
+       $all = false;
+
        // Get introductions
        if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
                Nav::setSelected('introductions');
@@ -119,6 +121,9 @@ function notifications_content(App $a)
        } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
                $notif_header = L10n::t('Home Notifications');
                $notifs = $nm->homeNotifs($show, $startrec, $perpage);
+       // fallback - redirect to main page
+       } else {
+               $a->internalRedirect('notifications');
        }
 
        // Set the pager
@@ -133,7 +138,7 @@ function notifications_content(App $a)
                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' ),
@@ -142,8 +147,8 @@ function notifications_content(App $a)
 
        // Process the data for template creation
        if (defaults($notifs, 'ident', '') === 'introductions') {
-               $sugg = get_markup_template('suggestions.tpl');
-               $tpl = get_markup_template('intros.tpl');
+               $sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+               $tpl = Renderer::getMarkupTemplate('intros.tpl');
 
                // The link to switch between ignored and normal connection requests
                $notif_show_lnk = [
@@ -209,7 +214,7 @@ function notifications_content(App $a)
                                                $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']);
                                        }
 
-                                       $dfrn_tpl = get_markup_template('netfriend.tpl');
+                                       $dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl');
                                        $dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
                                                '$intro_id'    => $notif['intro_id'],
                                                '$friend_selected' => $friend_selected,
@@ -221,6 +226,14 @@ function notifications_content(App $a)
                                                '$as_fan'      => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : 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'] != '') {
@@ -237,7 +250,7 @@ function notifications_content(App $a)
 
                                        $notif_content[] = Renderer::replaceMacros($tpl, [
                                                '$type'        => $notif['label'],
-                                               '$header'      => htmlentities($header),
+                                               '$header'      => $header,
                                                '$str_notifytype' => L10n::t('Notification type:'),
                                                '$notify_type' => $notif['notify_type'],
                                                '$dfrn_text'   => $dfrn_text,
@@ -268,6 +281,7 @@ function notifications_content(App $a)
                                                '$note'        => $notif['note'],
                                                '$ignore'      => L10n::t('Ignore'),
                                                '$discard'     => $discard,
+                                               '$action'      => $action,
                                        ]);
                                        break;
                        }
@@ -294,7 +308,7 @@ function notifications_content(App $a)
                                'notify'      => 'notify.tpl',
                        ];
 
-                       $tpl_notif = get_markup_template($notification_templates[$notif['label']]);
+                       $tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
 
                        $notif_content[] = Renderer::replaceMacros($tpl_notif, [
                                '$item_label' => $notif['label'],