[various] Move notification classes

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 8420ffe498e38addfd097ba5d1d84b9a8b61519b..ca32d6d5e6134ef932ee2d713e13a1d2b4ca1b4d 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,11 +7,12 @@
  * 
  *
  */
+
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 
 function gnot_install() {
 
@@ -79,6 +80,6 @@ function gnot_settings(&$a,&$s) {
 function gnot_enotify_mail(&$a,&$b) {
        if((! $b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable'))))
                return;
-       if($b['type'] == Type::COMMENT)
+       if($b['type'] == Notification\Type::COMMENT)
                $b['subject'] = DI::l10n()->t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
 }

diff --git a/public_server/public_server.php b/public_server/public_server.php
index bb7ebec940feae73721ec630d4f2c585c6ff4e7b..472a442f98e05461a35b629dad281dec3c27f91c 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -58,7 +58,7 @@ function public_server_cron($a, $b)
        if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        notification([
-                               'type' => Type::SYSTEM,
+                               'type' => Notification/Type::SYSTEM,
                                'uid' => $rr['uid'],
                                'system_type' => 'public_server_expire',
                                'source_name'  => DI::l10n()->t('Administrator'),

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index f0d29e0e078bf7f2e1d0439534653a06a29aa5f3..e0e0fb57bd9eb4ca5e1856e807e67e6c54fe5519 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -11,7 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
@@ -58,7 +58,7 @@ function testdrive_cron($a,$b) {
        if(count($r)) {
                foreach($r as $rr) {
                        notification([
-                               'type' => Type::SYSTEM,
+                               'type' => Notification/Type::SYSTEM,
                                'uid' => $rr['uid'],
                                'system_type' => 'testdrive_expire',
                                'source_name'  => DI::l10n()->t('Administrator'),