Move Notify::TYPE_WALL

diff --git a/boot.php b/boot.php
index 759e4e24f1ca025a3cd9637efa6977c9c669dcd5..3f7087622a2467db979ff02e029a97f7fcb6df68 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -140,7 +140,6 @@ define('MAX_LIKERS',    75);
  * Email notification options
  * @{
  */
-define('NOTIFY_WALL',         4);
 define('NOTIFY_COMMENT',      8);
 define('NOTIFY_MAIL',        16);
 define('NOTIFY_SUGGEST',     32);

diff --git a/include/enotify.php b/include/enotify.php
index f51c88eae88a9be63bfdf53afffe05799d7fef1c..fe38fad2d44be1c43b506dc88243bf610edfaf16 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -212,7 +212,7 @@ function notification($params)
                $itemlink =  $params['link'];
        }
 
-       if ($params['type'] == NOTIFY_WALL) {
+       if ($params['type'] == Notify\Type::WALL) {
                $subject = $l10n->t('[Friendica:Notify] %s posted to your profile wall', $params['source_name']);
 
                $preamble = $l10n->t('%1$s posted to your profile wall at %2$s', $params['source_name'], $sitename);

diff --git a/mod/item.php b/mod/item.php
index 3edf49f86c4e3127c768816cf51325d223e65e56..717c656d186fbac3bd2a868f55c1edc08fe12293 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -31,6 +31,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\Photo;
 use Friendica\Model\Term;
 use Friendica\Network\HTTPException;
@@ -771,7 +772,7 @@ function item_post(App $a) {
        } else {
                if (($contact_record != $author) && !count($forum_contact)) {
                        notification([
-                               'type'         => NOTIFY_WALL,
+                               'type'         => Type::WALL,
                                'notify_flags' => $user['notify-flags'],
                                'language'     => $user['language'],
                                'to_name'      => $user['username'],

diff --git a/mod/settings.php b/mod/settings.php
index a12d8a71f090a471d1b81c687379c57e072ceec0..855a5a1ce058a8ba2f2fc6c12a947b832aaa0783 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1231,8 +1231,8 @@ 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 & Type::INTRO), Type::INTRO, ''],
-               '$notify2'      => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), NOTIFY_CONFIRM, ''],
-               '$notify3'      => ['notify3', DI::l10n()->t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''],
+               '$notify2'      => ['notify2', DI::l10n()->t('Your introductions are confirmed'), ($notify & Type::CONFIRM), Type::CONFIRM, ''],
+               '$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 & NOTIFY_COMMENT), NOTIFY_COMMENT, ''],
                '$notify5'      => ['notify5', DI::l10n()->t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''],
                '$notify6'  => ['notify6', DI::l10n()->t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''],

diff --git a/src/Model/Notify/Type.php b/src/Model/Notify/Type.php
index 550a818d44b7b3dcf683b71ae710e6bb9150eaea..f026e081fdccc328e7e873045196e7a09e5692fc 100644 (file)
--- a/src/Model/Notify/Type.php
+++ b/src/Model/Notify/Type.php
@@ -7,8 +7,10 @@ namespace Friendica\Model\Notify;
  */
 class Type
 {
-       /** @var int Introduction notifications */
+       /** @var int Notification about a introduction */
        const INTRO  = 1;
        /** @var int Notification about a confirmed introduction */
        const CONFIRM = 2;
+       /** @var int Notification about a post on your wall */
+       const WALL = 4;
 }