Merge pull request #8155 from nupplaphil/task/move_notifications

[friendica.git] / src / Model / Notification.php

diff --git a/src/Model/Notification.php b/src/Model/Notification.php
index 8b0e0f1a5133921a012ed5d57bea73a72bcd1a0b..e1848667006ecd5cdd2136b4e3223bddb11b7fe9 100644 (file)
--- a/src/Model/Notification.php
+++ b/src/Model/Notification.php
@@ -240,7 +240,7 @@ final class Notification
                        // Transform the different types of notification in an usable array
                        switch ($notification['verb']) {
                                case Activity::LIKE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'like',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -253,7 +253,7 @@ final class Notification
                                        break;
 
                                case Activity::DISLIKE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'dislike',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -266,7 +266,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTEND:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attend',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -279,7 +279,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTENDNO:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attendno',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -292,7 +292,7 @@ final class Notification
                                        break;
 
                                case Activity::ATTENDMAYBE:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'attendmaybe',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -306,7 +306,7 @@ final class Notification
 
                                case Activity::FRIEND:
                                        if (!isset($notification['object'])) {
-                                               $formattedNotify = [
+                                               $formattedNotification = [
                                                        'label' => 'friend',
                                                        'link'  => $default_item_link,
                                                        'image' => $default_item_image,
@@ -325,7 +325,7 @@ final class Notification
                                        $obj                   = XML::parseString($xmlHead . $notification['object']);
                                        $notification['fname'] = $obj->title;
 
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => 'friend',
                                                'link'  => $this->baseUrl->get(true) . '/display/' . $notification['parent-guid'],
                                                'image' => ProxyUtils::proxifyUrl($notification['author-avatar'], false, ProxyUtils::SIZE_MICRO),
@@ -338,7 +338,7 @@ final class Notification
                                        break;
 
                                default:
-                                       $formattedNotify = [
+                                       $formattedNotification = [
                                                'label' => $default_item_label,
                                                'link'  => $default_item_link,
                                                'image' => $default_item_image,
@@ -350,7 +350,7 @@ final class Notification
                                        ];
                        }
 
-                       $formattedNotifications[] = $formattedNotify;
+                       $formattedNotifications[] = $formattedNotification;
                }
 
                return $formattedNotifications;
@@ -372,7 +372,7 @@ final class Notification
         */
        public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
        {
-               $ident    = self::NETWORK;
+               $ident         = self::NETWORK;
                $notifications = [];
 
                $condition = ['wall' => false, 'uid' => local_user()];
@@ -415,7 +415,7 @@ final class Notification
         */
        public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
        {
-               $ident    = self::SYSTEM;
+               $ident         = self::SYSTEM;
                $notifications = [];
 
                $filter = ['uid' => local_user()];
@@ -460,7 +460,7 @@ final class Notification
         */
        public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
        {
-               $ident    = self::PERSONAL;
+               $ident         = self::PERSONAL;
                $notifications = [];
 
                $myurl     = str_replace('http://', '', DI::app()->contact['nurl']);
@@ -507,7 +507,7 @@ final class Notification
         */
        public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
        {
-               $ident    = self::HOME;
+               $ident         = self::HOME;
                $notifications = [];
 
                $condition = ['wall' => true, 'uid' => local_user()];
@@ -553,9 +553,9 @@ final class Notification
        public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
        {
                /// @todo sanitize wording according to SELF::INTRO
-               $ident     = 'introductions';
-               $notifications  = [];
-               $sql_extra = "";
+               $ident         = 'introductions';
+               $notifications = [];
+               $sql_extra     = "";
 
                if (empty($id)) {
                        if (!$all) {
@@ -623,7 +623,7 @@ final class Notification
 
                                $intro = [
                                        'label'          => 'friend_suggestion',
-                                       'str_type'    => $this->l10n->t('Friend Suggestion'),
+                                       'str_type'       => $this->l10n->t('Friend Suggestion'),
                                        'intro_id'       => $intro['intro_id'],
                                        'madeby'         => $intro['name'],
                                        'madeby_url'     => $intro['url'],
@@ -657,7 +657,7 @@ final class Notification
                                }
                                $intro = [
                                        'label'          => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
-                                       'str_type'    => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
+                                       'str_type'       => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
                                        'dfrn_id'        => $intro['issued-id'],
                                        'uid'            => $_SESSION['uid'],
                                        'intro_id'       => $intro['intro_id'],