Move Notify::TYPE_SUGGEST

diff --git a/boot.php b/boot.php
index 4c16f59d60c33ca7ba1c51e20cf9837d7de977f1..950624ad44ff1da82843beb2ef9df7c77ff569fc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_SUGGEST',     32);
 define('NOTIFY_PROFILE',     64);
 define('NOTIFY_TAGSELF',    128);
 define('NOTIFY_TAGSHARE',   256);

diff --git a/include/enotify.php b/include/enotify.php
index ad141e1c47a50d3e4c136688dadc92e229a644f2..03fa428e8947a52d546f30d6f9fd091a0703917e 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -319,7 +319,7 @@ function notification($params)
                }
        }
 
-       if ($params['type'] == NOTIFY_SUGGEST) {
+       if ($params['type'] == Notify\Type::SUGGEST) {
                $itemlink =  $params['link'];
                $subject = $l10n->t('[Friendica:Notify] Friend suggestion received');
 

diff --git a/mod/settings.php b/mod/settings.php
index 7ae0f6479e1904ee4053f9eafdd3f8c6ec7646a5..bce3ac8be59024062f58d26d7d894f5a63a6a338 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1235,7 +1235,7 @@ function settings_content(App $a)
                '$notify3'      => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & Type::WALL), Type::WALL, ''],
                '$notify4'      => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & Type::COMMENT), Type::COMMENT, ''],
                '$notify5'      => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & Type::MAIL), Type::MAIL, ''],
-               '$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],
+               '$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & Type::SUGGEST), Type::SUGGEST, ''],
                '$notify7'  => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''],
                '$notify8'  => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
 

diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
index fbc31da37339e15202b8264db55ac33c5f2698e9..9c7e3b6deb666a856e32c05b0734271d56fbb359 100644 (file)
--- a/src/Model/Notify/Type.php
+++ b/src/Model/Notify/Type.php
@@ -17,4 +17,6 @@ class Type
        const COMMENT = 8;
        /** @var int Notification about a private message */
        const MAIL = 16;
+       /** @var int Notification about a friend suggestion */
+       const SUGGEST = 32;
 }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 424b519063da5385fb0ac06ab6314cbab5ddd134..b15816bc77ea7fcfe77f9405da3f344408992c8b 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -25,6 +25,7 @@ use Friendica\Model\Event;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\Mail;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\PermissionSet;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
@@ -1892,7 +1893,7 @@ class DFRN
 
                notification(
                        [
-                               'type'         => NOTIFY_SUGGEST,
+                               'type'         => Type::SUGGEST,
                                'notify_flags' => $importer['notify-flags'],
                                'language'     => $importer['language'],
                                'to_name'      => $importer['username'],