X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=58e1a75f00a830c64de414c5ca5c13f8c9d0f7b2;hb=33b491f2a6ce9f7030851fcdd55394c575e4322f;hp=80e6782c2dcc74303f22f5dc91b827aa8150aff9;hpb=ad9c67663d8206315c649be3b27bf5418fb91ad3;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index 80e6782c2d..58e1a75f00 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -11,8 +11,8 @@ use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; use Friendica\Model\Item; +use Friendica\Model\User; use Friendica\Util\DateTimeFormat; use Friendica\Util\Emailer; use Friendica\Util\Strings; @@ -25,7 +25,7 @@ use Friendica\Util\Strings; * link, subject, body, to_name, to_email, source_name, * source_link, activity, preamble, notify_flags, * language, show_in_notification_page - * @return bool|object + * @return bool * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ function notification($params) @@ -43,7 +43,7 @@ function notification($params) if (!DBA::isResult($user)) { Logger::log('Unknown user ' . $params['uid']); - return; + return false; } $params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']); @@ -79,7 +79,7 @@ function notification($params) // 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; + return false; } $nickname = $user["nickname"]; } else { @@ -120,6 +120,12 @@ function notification($params) } $epreamble = ''; + $preamble = ''; + $subject = ''; + $sitelink = ''; + $tsitelink = ''; + $hsitelink = ''; + $itemlink = ''; if ($params['type'] == NOTIFY_MAIL) { $itemlink = $siteurl.'/message/'.$params['item']['id']; @@ -140,7 +146,7 @@ function notification($params) if (DBA::isResult($thread) && $thread['ignored']) { Logger::log('Thread ' . $parent_id . ' will be ignored', Logger::DEBUG); L10n::popLang(); - return; + return false; } // Check to see if there was already a tag notify or comment notify for this post. @@ -149,7 +155,7 @@ function notification($params) 'link' => $params['link'], 'uid' => $params['uid']]; if (DBA::exists('notify', $condition)) { L10n::popLang(); - return; + return false; } // if it's a post figure out who's post it is. @@ -453,10 +459,6 @@ function notification($params) $body = $params['body']; - $sitelink = ""; - $tsitelink = ""; - $hsitelink = ""; - $itemlink = ""; $show_in_notification_page = false; } @@ -487,6 +489,8 @@ function notification($params) $hsitelink = $h['hsitelink']; $itemlink = $h['itemlink']; + $notify_id = 0; + if ($show_in_notification_page) { Logger::log("adding notification entry", Logger::DEBUG); do { @@ -518,7 +522,7 @@ function notification($params) if ($datarray['abort']) { L10n::popLang(); - return False; + return false; } // create notification entry in DB @@ -667,8 +671,7 @@ function notification($params) L10n::popLang(); // use the Emailer class to send the message - return Emailer::send( - [ + return Emailer::send([ 'uid' => $params['uid'], 'fromName' => $sender_name, 'fromEmail' => $sender_email, @@ -677,8 +680,8 @@ function notification($params) 'messageSubject' => $datarray['subject'], 'htmlVersion' => $email_html_body, 'textVersion' => $email_text_body, - 'additionalMailHeader' => $datarray['headers']] - ); + 'additionalMailHeader' => $datarray['headers'] + ]); } L10n::popLang(); @@ -774,7 +777,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]; $item = Item::selectFirst($fields, $condition); if (!DBA::isResult($item) || in_array($item['author-id'], $contacts)) { - return; + return false; } // Generate the notification array