X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=9a3e2b06682ca2caaac49f49bff130fd591fa49f;hb=34dce9fd7620ff878d2ad7ec3407430e9be5045c;hp=403688af6d2831cbac97c8039580f2f118d0ae49;hpb=09de4a5b47439542d5e73d5452e1d30da26c3ae6;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index 403688af6d..9a3e2b0668 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -12,11 +12,10 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; use Friendica\Model\ItemContent; +use Friendica\Model\Notify; use Friendica\Model\User; use Friendica\Model\UserItem; use Friendica\Protocol\Activity; -use Friendica\Util\DateTimeFormat; -use Friendica\Util\Emailer; /** * Creates a notification entry and possibly sends a mail @@ -31,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()]); @@ -55,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']; @@ -160,7 +134,7 @@ function notification($params) // if it's a post figure out who's post it is. $item = null; - if ($params['otype'] === 'item' && $parent_id) { + if ($params['otype'] === Notify::OTYPE_ITEM && $parent_id) { $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id, 'deleted' => false]); } @@ -428,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 = [ @@ -482,70 +432,48 @@ function notification($params) $notify_id = 0; if ($show_in_notification_page) { - Logger::log("adding notification entry", Logger::DEBUG); - - /// @TODO One statement is enough - $datarray = []; - $datarray['name'] = $params['source_name']; - $datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name'])); - $datarray['url'] = $params['source_link']; - $datarray['photo'] = $params['source_photo']; - $datarray['date'] = DateTimeFormat::utcNow(); - $datarray['uid'] = $params['uid']; - $datarray['link'] = $itemlink; - $datarray['iid'] = $item_id; - $datarray['parent'] = $parent_id; - $datarray['type'] = $params['type']; - $datarray['verb'] = $params['verb']; - $datarray['otype'] = $params['otype']; - $datarray['abort'] = false; - - Hook::callAll('enotify_store', $datarray); - - if ($datarray['abort']) { - return false; - } - - // create notification entry in DB - $fields = ['name' => $datarray['name'], 'url' => $datarray['url'], - 'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'], - 'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'], - 'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'], - 'name_cache' => $datarray["name_cache"]]; - DBA::insert('notify', $fields); + $notification = DI::notify()->insert([ + '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'] ?? '', + ]); - $notify_id = DBA::lastInsertId(); + $notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]); - $itemlink = DI::baseUrl().'/notification/view/'.$notify_id; - $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]); - $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg))); + DI::notify()->update($notification); - $fields = ['msg' => $msg, 'msg_cache' => $msg_cache]; - $condition = ['id' => $notify_id, 'uid' => $params['uid']]; - DBA::update('notify', $fields, $condition); + $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'); if (isset($params['parent']) && (intval($params['parent']) != 0)) { - $id_for_parent = $params['parent']."@".$hostname; + $id_for_parent = $params['parent'] . "@" . $hostname; // Is this the first email notification for this parent item and user? if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) { - Logger::log("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), Logger::DEBUG); + Logger::log("notify_id:" . intval($notify_id) . ", parent: " . intval($params['parent']) . "uid: " . intval($params['uid']), Logger::DEBUG); - $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'], - 'receiver-uid' => $params['uid'], 'parent-item' => 0]; + $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'], + 'receiver-uid' => $params['uid'], 'parent-item' => 0]; DBA::insert('notify-threads', $fields); $additional_mail_header .= "Message-ID: <${id_for_parent}>\n"; - $log_msg = "include/enotify: No previous notification found for this parent:\n". - " parent: ${params['parent']}\n"." uid : ${params['uid']}\n"; + $log_msg = "include/enotify: No previous notification found for this parent:\n" . + " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; Logger::log($log_msg, Logger::DEBUG); } else { // If not, just "follow" the thread. @@ -554,94 +482,46 @@ 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, - ]); + $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); + } - // 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, - ]); + $email = $builder->build(); // use the Emailer class to send the message - return Emailer::send([ - 'uid' => $params['uid'], - 'fromName' => $sender_name, - 'fromEmail' => $sender_email, - 'replyTo' => $sender_email, - 'toEmail' => $params['to_email'], - 'messageSubject' => $datarray['subject'], - 'htmlVersion' => $email_html_body, - 'textVersion' => $email_text_body, - 'additionalMailHeader' => $datarray['headers'] - ]); + return DI::emailer()->send($email); } return false; @@ -732,27 +612,3 @@ function check_item_notification($itemid, $uid, $notification_type) { notification($params); } - -/** - * Formats a notification message with the notification author - * - * Replace the name with {0} but ensure to make that only once. The {0} is used - * later and prints the name in bold. - * - * @param string $name - * @param string $message - * @return string Formatted message - */ -function format_notification_message($name, $message) { - if ($name != '') { - $pos = strpos($message, $name); - } else { - $pos = false; - } - - if ($pos !== false) { - $message = substr_replace($message, '{0}', $pos, strlen($name)); - } - - return $message; -}