Move Notify::TYPE_INTRO

diff --git a/boot.php b/boot.php
index 3852c3279af24e3dc00ca1729d6a8e38d1ec5c6c..f708ff8820c3443b0241f368329f809c2822f770 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_INTRO',        1);
 define('NOTIFY_CONFIRM',      2);
 define('NOTIFY_WALL',         4);
 define('NOTIFY_COMMENT',      8);

diff --git a/include/enotify.php b/include/enotify.php
index 9f18a472d247361c392243a1a18d49ad65c99dde..141fd36757bf89482fb84ad936b0c75d67f71f02 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -276,7 +276,7 @@ function notification($params)
                $hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
        }
 
-       if ($params['type'] == NOTIFY_INTRO) {
+       if ($params['type'] == Notify\Type::INTRO) {
                $itemlink = $params['link'];
                $subject = $l10n->t('[Friendica:Notify] Introduction received');
 

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index d8ad2bd3a546ac0a22b7501ff3352084b956cf69..bf1fbe3c90430206c91afc4aa4f411555565c131 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -23,6 +23,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
@@ -552,7 +553,7 @@ function dfrn_request_content(App $a)
 
                                if (!$auto_confirm) {
                                        notification([
-                                               'type'         => NOTIFY_INTRO,
+                                               'type'         => Type::INTRO,
                                                'notify_flags' => $r[0]['notify-flags'],
                                                'language'     => $r[0]['language'],
                                                'to_name'      => $r[0]['username'],

diff --git a/mod/ping.php b/mod/ping.php
index 70c580d3d31ff4f5c7385ee8125789d15334a2b3..580d82a95fbd174c705f4891f32d5acec11032c8 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -13,6 +13,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Notify\Type;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -403,7 +404,7 @@ function ping_get_notifications($uid)
                        AND NOT (`notify`.`type` IN (%d, %d))
                        AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
                        intval($uid),
-                       intval(NOTIFY_INTRO),
+                       intval(Type::INTRO),
                        intval(NOTIFY_MAIL),
                        intval($offset)
                );

diff --git a/mod/settings.php b/mod/settings.php
index 277470ad5b1dcfa1e36cb9a24fa38e9de68407c4..3a9d911042c335ee170bf31ff8e51cb3cbd72307 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -19,6 +19,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\Email;
@@ -1229,7 +1230,7 @@ function settings_content(App $a)
 
                '$h_not'        => DI::l10n()->t('Notification Settings'),
                '$lbl_not'      => DI::l10n()->t('Send a notification email when:'),
-               '$notify1'      => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''],
+               '$notify1'      => ['notify1', DI::l10n()->t('You receive an introduction'), ($notify & Type::INTRO), NOTIFY_INTRO, ''],
                '$notify2'      => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''],
                '$notify3'      => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
                '$notify4'      => ['notify4', DI::l10n()->t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 3897f821b7f2820f408df6fb19278ebb40e533c7..051f94d3efde350beec374578b26798ba2afa719 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -14,6 +14,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Notify\Type;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
@@ -2628,11 +2629,11 @@ class Contact
 
                                Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
-                               if (($user['notify-flags'] & NOTIFY_INTRO) &&
+                               if (($user['notify-flags'] & Type::INTRO) &&
                                        in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
 
                                        notification([
-                                               'type'         => NOTIFY_INTRO,
+                                               'type'         => Type::INTRO,
                                                'notify_flags' => $user['notify-flags'],
                                                'language'     => $user['language'],
                                                'to_name'      => $user['username'],

diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
new file mode 100644 (file)
index 0000000..5f34e1a
--- /dev/null
+++ b/src/Model/Notify/Type.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Friendica\Model\Notify;
+
+/**
+ * Enum for different types of the Notify
+ */
+class Type
+{
+       /** @var int Introduction notifications */
+       const INTRO  = 1;
+}

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 8f52ec38ce7e26be09de2ce0c278600aa051e24f..eb38f02891d1aa575095900291222314a73a66c5 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -9,6 +9,7 @@ use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\ForbiddenException;
 
@@ -111,7 +112,7 @@ class Delegation extends BaseModule
 
                        $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
 
-                       $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
+                       $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], Type::INTRO, NOTIFY_MAIL];
                        $params = ['distinct' => true, 'expression' => 'parent'];
                        $notifications = DBA::count('notify', $condition, $params);