X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=9a3e2b06682ca2caaac49f49bff130fd591fa49f;hb=34dce9fd7620ff878d2ad7ec3407430e9be5045c;hp=f55c9f6ccdc0a000cc73ab0ca9e2640101b4e134;hpb=2b8f0677158feff781478898e1d58e1bb2100c96;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index f55c9f6ccd..9a3e2b0668 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -15,10 +15,7 @@ use Friendica\Model\ItemContent; use Friendica\Model\Notify; use Friendica\Model\User; use Friendica\Model\UserItem; -use Friendica\Object\EMail; use Friendica\Protocol\Activity; -use Friendica\Util\DateTimeFormat; -use Friendica\Util\Emailer; /** * Creates a notification entry and possibly sends a mail @@ -33,8 +30,6 @@ use Friendica\Util\Emailer; */ function notification($params) { - $a = DI::app(); - // Temporary logging for finding the origin if (!isset($params['uid'])) { Logger::notice('Missing parameters "uid".', ['params' => $params, 'callstack' => System::callstack()]); @@ -57,51 +52,28 @@ function notification($params) // from here on everything is in the recipients language $l10n = DI::l10n()->withLang($params['language']); - $banner = $l10n->t('Friendica Notification'); - $product = FRIENDICA_PLATFORM; $siteurl = DI::baseUrl()->get(true); - $thanks = $l10n->t('Thank You,'); $sitename = DI::config()->get('config', 'sitename'); - if (DI::config()->get('config', 'admin_name')) { - $site_admin = $l10n->t('%1$s, %2$s Administrator', DI::config()->get('config', 'admin_name'), $sitename); - } else { - $site_admin = $l10n->t('%s Administrator', $sitename); - } - $sender_name = $sitename; $hostname = DI::baseUrl()->getHostname(); if (strpos($hostname, ':')) { $hostname = substr($hostname, 0, strpos($hostname, ':')); } - $sender_email = $a->getSenderEmailAddress(); + $user = User::getById($params['uid'], ['nickname', 'page-flags']); - if ($params['type'] != SYSTEM_EMAIL) { - $user = DBA::selectFirst('user', ['nickname', 'page-flags'], - ['uid' => $params['uid']]); - - // There is no need to create notifications for forum accounts - if (!DBA::isResult($user) || in_array($user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { - return false; - } - $nickname = $user["nickname"]; - } else { - $nickname = ''; + // There is no need to create notifications for forum accounts + if (!DBA::isResult($user) || in_array($user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) { + return false; } + $nickname = $user["nickname"]; // with $params['show_in_notification_page'] == false, the notification isn't inserted into // the database, and an email is sent if applicable. // default, if not specified: true $show_in_notification_page = isset($params['show_in_notification_page']) ? $params['show_in_notification_page'] : true; - $additional_mail_header = ""; - $additional_mail_header .= "Precedence: list\n"; - $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; - $additional_mail_header .= "X-Friendica-Account: <".$nickname."@".$hostname.">\n"; - $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; - $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; - $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".DI::baseUrl()."/notifications/system>\n"; + $additional_mail_header = "X-Friendica-Account: <".$nickname."@".$hostname.">\n"; if (array_key_exists('item', $params)) { $title = $params['item']['title']; @@ -430,30 +402,6 @@ function notification($params) } } - if ($params['type'] == SYSTEM_EMAIL) { - // not part of the notifications. - // it just send a mail to the user. - // It will be used by the system to send emails to users (like - // password reset, invitations and so) using one look (but without - // add a notification to the user, with could be inexistent) - if (!isset($params['subject'])) { - Logger::warning('subject isn\'t set.', ['type' => $params['type']]); - } - $subject = $params['subject'] ?? ''; - - if (!isset($params['preamble'])) { - Logger::warning('preamble isn\'t set.', ['type' => $params['type'], 'subject' => $subject]); - } - $preamble = $params['preamble'] ?? ''; - - if (!isset($params['body'])) { - Logger::warning('body isn\'t set.', ['type' => $params['type'], 'subject' => $subject, 'preamble' => $preamble]); - } - $body = $params['body'] ?? ''; - - $show_in_notification_page = false; - } - $subject .= " (".$nickname."@".$hostname.")"; $h = [ @@ -485,30 +433,30 @@ function notification($params) if ($show_in_notification_page) { $notification = DI::notify()->insert([ - 'name' => $params['source_name'], - 'url' => $params['source_link'], - 'photo' => $params['source_photo'], - 'uid' => $params['uid'], - 'iid' => $item_id, - 'parent' => $parent_id, - 'type' => $params['type'], - 'verb' => $params['verb'], - 'otype' => $params['otype'], + 'name' => $params['source_name'] ?? '', + 'name_cache' => strip_tags(BBCode::convert($params['source_name'] ?? '')), + 'url' => $params['source_link'] ?? '', + 'photo' => $params['source_photo'] ?? '', + 'link' => $itemlink ?? '', + 'uid' => $params['uid'] ?? 0, + 'iid' => $item_id ?? 0, + 'parent' => $parent_id ?? 0, + 'type' => $params['type'] ?? '', + 'verb' => $params['verb'] ?? '', + 'otype' => $params['otype'] ?? '', ]); - $notification->link = DI::baseUrl() . '/notification/view/' . $notification->id; - $notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]); + $notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]); DI::notify()->update($notification); - $itemlink = $notification->link; + $itemlink = DI::baseUrl() . '/notification/' . $notification->id; $notify_id = $notification->id; } // send email notification if notification preferences permit if ((intval($params['notify_flags']) & intval($params['type'])) - || $params['type'] == NOTIFY_SYSTEM - || $params['type'] == SYSTEM_EMAIL) { + || $params['type'] == NOTIFY_SYSTEM) { Logger::log('sending notification email'); @@ -534,85 +482,43 @@ function notification($params) } } - $textversion = BBCode::toPlaintext($body); - $htmlversion = BBCode::convert($body); - - $datarray = []; - $datarray['banner'] = $banner; - $datarray['product'] = $product; - $datarray['preamble'] = $preamble; - $datarray['sitename'] = $sitename; - $datarray['siteurl'] = $siteurl; - $datarray['type'] = $params['type']; - $datarray['parent'] = $parent_id; - $datarray['source_name'] = $params['source_name'] ?? ''; - $datarray['source_link'] = $params['source_link'] ?? ''; - $datarray['source_photo'] = $params['source_photo'] ?? ''; - $datarray['uid'] = $params['uid']; - $datarray['username'] = $params['to_name'] ?? ''; - $datarray['hsitelink'] = $hsitelink; - $datarray['tsitelink'] = $tsitelink; - $datarray['hitemlink'] = '' . $itemlink . ''; - $datarray['titemlink'] = $itemlink; - $datarray['thanks'] = $thanks; - $datarray['site_admin'] = $site_admin; - $datarray['title'] = stripslashes($title); - $datarray['htmlversion'] = $htmlversion; - $datarray['textversion'] = $textversion; - $datarray['subject'] = $subject; - $datarray['headers'] = $additional_mail_header; + $datarray = [ + 'preamble' => $preamble, + 'type' => $params['type'], + 'parent' => $parent_id, + 'source_name' => $params['source_name'] ?? null, + 'source_link' => $params['source_link'] ?? null, + 'source_photo' => $params['source_photo'] ?? null, + 'uid' => $params['uid'], + 'hsitelink' => $hsitelink, + 'tsitelink' => $tsitelink, + 'itemlink' => $itemlink, + 'title' => $title, + 'body' => $body, + 'subject' => $subject, + 'headers' => $additional_mail_header, + ]; Hook::callAll('enotify_mail', $datarray); - // check whether sending post content in email notifications is allowed - // always true for SYSTEM_EMAIL - $content_allowed = ((!DI::config()->get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL)); - - // load the template for private message notifications - $tpl = Renderer::getMarkupTemplate('email_notify_html.tpl'); - $email_html_body = Renderer::replaceMacros($tpl, [ - '$banner' => $datarray['banner'], - '$product' => $datarray['product'], - '$preamble' => str_replace("\n", "
\n", $datarray['preamble']), - '$sitename' => $datarray['sitename'], - '$siteurl' => $datarray['siteurl'], - '$source_name' => $datarray['source_name'], - '$source_link' => $datarray['source_link'], - '$source_photo' => $datarray['source_photo'], - '$username' => $datarray['username'], - '$hsitelink' => $datarray['hsitelink'], - '$hitemlink' => $datarray['hitemlink'], - '$thanks' => $datarray['thanks'], - '$site_admin' => $datarray['site_admin'], - '$title' => $datarray['title'], - '$htmlversion' => $datarray['htmlversion'], - '$content_allowed' => $content_allowed, - ]); - - // load the template for private message notifications - $tpl = Renderer::getMarkupTemplate('email_notify_text.tpl'); - $email_text_body = Renderer::replaceMacros($tpl, [ - '$banner' => $datarray['banner'], - '$product' => $datarray['product'], - '$preamble' => $datarray['preamble'], - '$sitename' => $datarray['sitename'], - '$siteurl' => $datarray['siteurl'], - '$source_name' => $datarray['source_name'], - '$source_link' => $datarray['source_link'], - '$source_photo' => $datarray['source_photo'], - '$username' => $datarray['username'], - '$tsitelink' => $datarray['tsitelink'], - '$titemlink' => $datarray['titemlink'], - '$thanks' => $datarray['thanks'], - '$site_admin' => $datarray['site_admin'], - '$title' => $datarray['title'], - '$textversion' => $datarray['textversion'], - '$content_allowed' => $content_allowed, - ]); + $builder = DI::emailer() + ->newNotifyMail($l10n) + ->addHeaders($datarray['headers']) + ->withRecipient($params['to_email']) + ->forUser($datarray['uid']) + ->withNotification($datarray['subject'], $datarray['preamble'], $datarray['title'], $datarray['body']) + ->withSiteLink($datarray['tsitelink'], $datarray['hsitelink']) + ->withItemLink($datarray['itemlink']); + + // If a photo is present, add it to the email + if (!empty($datarray['source_photo'])) { + $builder->withPhoto( + $datarray['source_photo'], + $datarray['source_link'] ?? $sitelink, + $datarray['source_name'] ?? $sitename); + } - $email = new EMail($sender_name, $sender_email, $sender_email, $params['to_email'], - $datarray['subject'], $email_html_body, $email_text_body, - $datarray['headers'], $params['uid']); + $email = $builder->build(); // use the Emailer class to send the message return DI::emailer()->send($email);