Move Notify::TYPE_POKE

diff --git a/boot.php b/boot.php
index f7d7c298f23f64903beae98238d16ac51f09452e..84d4300341216a61538b3d6b64330171a4ce486e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_POKE',       512);
 define('NOTIFY_SHARE',     1024);
 
 define('NOTIFY_SYSTEM',   32768);

diff --git a/include/enotify.php b/include/enotify.php
index d3c4c74f3932d6d8ddb2473b9e60c46f972e881e..31983d8947ecb6a40769e72ad76052d7d5daca4f 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -242,7 +242,7 @@ function notification($params)
                $itemlink =  $params['link'];
        }
 
-       if ($params['type'] == NOTIFY_POKE) {
+       if ($params['type'] == Notify\Type::POKE) {
                $subject = $l10n->t('[Friendica:Notify] %1$s poked you', $params['source_name']);
 
                $preamble = $l10n->t('%1$s poked you at %2$s', $params['source_name'], $sitename);

diff --git a/mod/settings.php b/mod/settings.php
index 9a8a8ba270fd5045cce35dbe31bdac497aeb9965..69d9c77c9fd2fe78c60b38213957b8d4eb7cce56 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1237,7 +1237,7 @@ function settings_content(App $a)
                '$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 & Type::SUGGEST), Type::SUGGEST, ''],
                '$notify7'  => ['notify7', DI::l10n()->t('You are tagged in a post'), ($notify & Type::TAG_SELF), Type::TAG_SELF, ''],
-               '$notify8'  => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''],
+               '$notify8'  => ['notify8', DI::l10n()->t('You are poked/prodded/etc. in a post'), ($notify & Type::POKE), Type::POKE, ''],
 
                '$desktop_notifications' => ['desktop_notifications', DI::l10n()->t('Activate desktop notifications') , false, DI::l10n()->t('Show desktop popup on new notifications')],
 

diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
index b329d7696b5bb1d0d1703835e5be330b8240456c..80e5c493754f0b0f1254533aee61d90769ab62e5 100644 (file)
--- a/src/Model/Notify/Type.php
+++ b/src/Model/Notify/Type.php
@@ -29,4 +29,6 @@ class Type
         * @deprecated
         */
        const TAG_SHARE = 256;
+       /** @var int Notification about getting poked/prodded/etc. */
+       const POKE = 512;
 }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b15816bc77ea7fcfe77f9405da3f344408992c8b..9269fcc5e0d4a388d15f8e5ef083659d26e20e76 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2137,7 +2137,7 @@ class DFRN
                                // send a notification
                                notification(
                                        [
-                                       "type"         => NOTIFY_POKE,
+                                       "type"         => Type::POKE,
                                        "notify_flags" => $importer["notify-flags"],
                                        "language"     => $importer["language"],
                                        "to_name"      => $importer["username"],