X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=a277e59813ecb53a11907a2a7e9736a609408cdb;hb=5a02e39a65f8f685440228cc1d36738cbe15f32b;hp=2cb434ae98c6d41530caa5b05a5dbb62667666ad;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index 2cb434ae98..a277e59813 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,12 +1,20 @@
 <?php
+/**
+ * @file mod/notify.php
+ */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 use Friendica\Module\Login;
+use Friendica\Util\Temporal;
 
-function notify_init(App $a) {
+function notify_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -19,11 +27,11 @@ function notify_init(App $a) {
 			$nm->setSeen($note);
 
 			// The friendica client has problems with the GUID. this is some workaround
-			if ($a->is_friendica_app()) {
+			if ($a->isFriendicaApp()) {
 				require_once("include/items.php");
 				$urldata = parse_url($note['link']);
 				$guid = basename($urldata["path"]);
-				$itemdata = get_item_id($guid, local_user());
+				$itemdata = Item::getIdAndNickByGuid($guid, local_user());
 				if ($itemdata["id"] != 0) {
 					$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
 				}
@@ -35,16 +43,16 @@ function notify_init(App $a) {
 		goaway(System::baseUrl(true));
 	}
 
-	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
+	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
 		$r = $nm->setAllSeen();
 		$j = json_encode(['result' => ($r) ? 'success' : 'fail']);
 		echo $j;
 		killme();
 	}
-
 }
 
-function notify_content(App $a) {
+function notify_content(App $a)
+{
 	if (! local_user()) {
 		return Login::form();
 	}
@@ -54,29 +62,26 @@ function notify_content(App $a) {
 	$notif_tpl = get_markup_template('notifications.tpl');
 
 	$not_tpl = get_markup_template('notify.tpl');
-	require_once('include/bbcode.php');
 
 	$r = $nm->getAll(['seen'=>0]);
-	if (DBM::is_result($r) > 0) {
+	if (DBA::isResult($r) > 0) {
 		foreach ($r as $it) {
-			$notif_content .= replace_macros($not_tpl,[
+			$notif_content .= replace_macros($not_tpl, [
 				'$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'])
+				'$item_text' => strip_tags(BBCode::convert($it['msg'])),
+				'$item_when' => Temporal::getRelativeDate($it['date'])
 			]);
 		}
 	} else {
-		$notif_content .= t('No more system notifications.');
+		$notif_content .= L10n::t('No more system notifications.');
 	}
 
-	$o .= replace_macros($notif_tpl, [
-		'$notif_header' => t('System Notifications'),
+	$o = replace_macros($notif_tpl, [
+		'$notif_header' => L10n::t('System Notifications'),
 		'$tabs' => false, // $tabs,
 		'$notif_content' => $notif_content,
 	]);
 
 	return $o;
-
-
 }