X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=eeea130a60b8ca16e2c0c36fcf3694d6eb5d102c;hb=6b8db5ad1333e2b430da3a771d9a962d44d4b6fc;hp=96a54937548cb03dfed6b696d8b7733cae906d7d;hpb=50cce950f6faffc3d720dd106d3b8e2a043114b2;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 96a5493754..eeea130a60 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -9,10 +9,12 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Database\DBA;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
 
@@ -80,7 +82,7 @@ class Mail
 			'source_name' => $msg['from-name'],
 			'source_link' => $msg['from-url'],
 			'source_photo' => $msg['from-photo'],
-			'verb' => ACTIVITY_POST,
+			'verb' => Activity::POST,
 			'otype' => 'mail'
 		];
 
@@ -103,7 +105,7 @@ class Mail
 	 */
 	public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
 	{
-		$a = \get_app();
+		$a = DI::app();
 
 		if (!$recipient) {
 			return -1;
@@ -147,7 +149,7 @@ class Mail
 			$recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
 			$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
-			$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+			$sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
 			$conv_guid = System::createUUID();
 			$convuri = $recip_handle . ':' . $conv_guid;
@@ -213,7 +215,7 @@ class Mail
 			$images = $match[1];
 			if (count($images)) {
 				foreach ($images as $image) {
-					if (!stristr($image, System::baseUrl() . '/photo/')) {
+					if (!stristr($image, DI::baseUrl() . '/photo/')) {
 						continue;
 					}
 					$image_uri = substr($image, strrpos($image, '/') + 1);
@@ -261,7 +263,7 @@ class Mail
 
 		$conv_guid = System::createUUID();
 
-		$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+		$recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
 		$sender_nick = basename($replyto);
 		$sender_host = substr($replyto, strpos($replyto, '://') + 3);