X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FMail.php;h=815b0051d9df1ff0b5cc7ef2d2c3eea09fb85053;hb=4894e89f036be1f8a82523ac69d56ae36e7685df;hp=24a174b6b58251df7c5dd674c4ad75d207c50b46;hpb=47c2565917bb0f190ef9374d261e538c424b210c;p=friendica.git diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 24a174b6b5..815b0051d9 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -6,6 +6,7 @@ namespace Friendica\Model; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -46,7 +47,7 @@ class Mail return -2; } - $guid = System::createGUID(32); + $guid = System::createUUID(); $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; $convid = 0; @@ -73,7 +74,7 @@ class Mail $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - $conv_guid = System::createGUID(32); + $conv_guid = System::createUUID(); $convuri = $recip_handle . ':' . $conv_guid; $handles = $recip_handle . ';' . $sender_handle; @@ -87,7 +88,7 @@ class Mail } if (!$convid) { - logger('send message: conversation not found.'); + Logger::log('send message: conversation not found.'); return -4; } @@ -171,7 +172,7 @@ class Mail $subject = L10n::t('[no subject]'); } - $guid = System::createGUID(32); + $guid = System::createUUID(); $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; $me = Probe::uri($replyto); @@ -180,7 +181,7 @@ class Mail return -2; } - $conv_guid = System::createGUID(32); + $conv_guid = System::createUUID(); $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); @@ -200,7 +201,7 @@ class Mail } if (!$convid) { - logger('send message: conversation not found.'); + Logger::log('send message: conversation not found.'); return -4; }