X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=913f83f9beef777ef70277b7834ceec5ba78feea;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=e3806819342b12dcf67c8cd6c73ea7f2d48b9c5b;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index e380681934..913f83f9be 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,8 +1,10 @@
 <?php
 
 use Friendica\App;
-
-require_once('include/NotificationsManager.php');
+use Friendica\Core\NotificationsManager;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Module\Login;
 
 function notify_init(App $a) {
 	if (! local_user()) {
@@ -23,14 +25,14 @@ function notify_init(App $a) {
 				$guid = basename($urldata["path"]);
 				$itemdata = get_item_id($guid, local_user());
 				if ($itemdata["id"] != 0) {
-					$note['link'] = App::get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+					$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
 				}
 			}
 
 			goaway($note['link']);
 		}
 
-		goaway(App::get_baseurl(true));
+		goaway(System::baseUrl(true));
 	}
 
 	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
@@ -44,7 +46,7 @@ function notify_init(App $a) {
 
 function notify_content(App $a) {
 	if (! local_user()) {
-		return login();
+		return Login::form();
 	}
 
 	$nm = new NotificationsManager();
@@ -55,10 +57,10 @@ function notify_content(App $a) {
 	require_once('include/bbcode.php');
 
 	$r = $nm->getAll(array('seen'=>0));
-	if (dbm::is_result($r) > 0) {
+	if (DBM::is_result($r) > 0) {
 		foreach ($r as $it) {
 			$notif_content .= replace_macros($not_tpl,array(
-				'$item_link' => App::get_baseurl(true).'/notify/view/'. $it['id'],
+				'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
 				'$item_image' => $it['photo'],
 				'$item_text' => strip_tags(bbcode($it['msg'])),
 				'$item_when' => relative_date($it['date'])