X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailstream%2Fmailstream.php;h=c22516b3e342de0f9b1fb3461f29e5c2a9a0251a;hb=050b46139b1ee3f61d1ca6d14bd0891fef794863;hp=8b3c6ede06a1498128fa10170717567f3ea9f51a;hpb=76a9630d40e258e36d289d74a7bd28a0af9f6f15;p=friendica-addons.git diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 8b3c6ede..c22516b3 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -7,162 +7,231 @@ */ use Friendica\Content\Text\BBCode; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Hook; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\Database\DBA; -use Friendica\Util\Network; +use Friendica\DI; use Friendica\Model\Item; +use Friendica\Model\Post; +use Friendica\Protocol\Activity; -function mailstream_install() { - Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); - Addon::registerHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); - Addon::registerHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Addon::registerHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Addon::registerHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); +/** + * Sets up the addon hooks and the database table + */ +function mailstream_install() +{ + Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); + Hook::register('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); + Hook::register('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Hook::register('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - if (Config::get('mailstream', 'dbversion') == '0.1') { + if (DI::config()->get('mailstream', 'dbversion') == '0.1') { q('ALTER TABLE `mailstream_item` DROP INDEX `uid`'); q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`'); q('ALTER TABLE `mailstream_item` DROP INDEX `plink`'); q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL'); - Config::set('mailstream', 'dbversion', '0.2'); + DI::config()->set('mailstream', 'dbversion', '0.2'); } - if (Config::get('mailstream', 'dbversion') == '0.2') { + if (DI::config()->get('mailstream', 'dbversion') == '0.2') { q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"'); - Config::set('mailstream', 'dbversion', '0.3'); + DI::config()->set('mailstream', 'dbversion', '0.3'); } - if (Config::get('mailstream', 'dbversion') == '0.3') { + if (DI::config()->get('mailstream', 'dbversion') == '0.3') { q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()'); q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL'); - Config::set('mailstream', 'dbversion', '0.4'); + DI::config()->set('mailstream', 'dbversion', '0.4'); } - if (Config::get('mailstream', 'dbversion') == '0.4') { + if (DI::config()->get('mailstream', 'dbversion') == '0.4') { q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'); - Config::set('mailstream', 'dbversion', '0.5'); + DI::config()->set('mailstream', 'dbversion', '0.5'); } - if (Config::get('mailstream', 'dbversion') == '0.5') { - Config::set('mailstream', 'dbversion', '1.0'); + if (DI::config()->get('mailstream', 'dbversion') == '0.5') { + DI::config()->set('mailstream', 'dbversion', '1.0'); } - if (Config::get('retriever', 'dbversion') != '1.0') { + if (DI::config()->get('retriever', 'dbversion') != '1.0') { $schema = file_get_contents(dirname(__file__).'/database.sql'); $arr = explode(';', $schema); foreach ($arr as $a) { $r = q($a); } - Config::set('mailstream', 'dbversion', '1.0'); + DI::config()->set('mailstream', 'dbversion', '1.0'); } } -function mailstream_uninstall() { - Addon::unregisterHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); - Addon::unregisterHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); - Addon::unregisterHook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - Addon::unregisterHook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Addon::unregisterHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - Addon::unregisterHook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); +/** + * This funciton indicates a module that can be wrapped in the LegacyModule class + */ +function mailstream_module() +{ } -function mailstream_module() {} - -function mailstream_addon_admin(&$a,&$o) { - $frommail = Config::get('mailstream', 'frommail'); - $template = get_markup_template('admin.tpl', 'addon/mailstream/'); +/** + * Adds an item in "addon features" in the admin menu of the site + * + * @param Friendica\App $a App object (unused) + * @param string $o HTML form data + */ +function mailstream_addon_admin(&$a, &$o) +{ + $frommail = DI::config()->get('mailstream', 'frommail'); + $template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/'); $config = ['frommail', - L10n::t('From Address'), + DI::l10n()->t('From Address'), $frommail, - L10n::t('Email address that stream items will appear to be from.')]; - $o .= replace_macros($template, [ + DI::l10n()->t('Email address that stream items will appear to be from.')]; + $o .= Renderer::replaceMacros($template, [ '$frommail' => $config, - '$submit' => L10n::t('Save Settings')]); + '$submit' => DI::l10n()->t('Save Settings')]); } -function mailstream_addon_admin_post ($a) { - if (x($_POST, 'frommail')) { - Config::set('mailstream', 'frommail', $_POST['frommail']); +/** + * Process input from the "addon features" part of the admin menu + */ +function mailstream_addon_admin_post() +{ + if (!empty($_POST['frommail'])) { + DI::config()->set('mailstream', 'frommail', $_POST['frommail']); } } -function mailstream_generate_id($a, $uri) { - // http://www.jwz.org/doc/mid.html - $host = $a->get_hostname(); +/** + * Creates a message ID for a post URI in accordance with RFC 1036 + * See also http://www.jwz.org/doc/mid.html + * + * @param string $uri the URI to be converted to a message ID + * + * @return string the created message ID + */ +function mailstream_generate_id($uri) +{ + $host = DI::baseUrl()->getHostname(); $resource = hash('md5', $uri); $message_id = "<" . $resource . "@" . $host . ">"; - logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG); + Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri); return $message_id; } -function mailstream_post_hook(&$a, &$item) { - if (!PConfig::get($item['uid'], 'mailstream', 'enabled')) { +/** + * Called when either a local or remote post is created. Creates a + * record in the mailstream_item table to track this email, and then + * immediately attempts to send it + * + * @param Friendica\App $a App object (unused) + * @param array $item content of the item (may or may not already be stored in the item table) + */ +function mailstream_post_hook(&$a, &$item) +{ + if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) { + Logger::debug('mailstream: not enabled for item ' . $item['id']); return; } if (!$item['uid']) { + Logger::debug('mailstream: no uid for item ' . $item['id']); return; } if (!$item['contact-id']) { + Logger::debug('mailstream: no contact-id for item ' . $item['id']); return; } if (!$item['uri']) { + Logger::debug('mailstream: no uri for item ' . $item['id']); + return; + } + if (!$item['plink']) { + Logger::debug('mailstream: no plink for item ' . $item['id']); return; } - if (PConfig::get($item['uid'], 'mailstream', 'nolikes')) { - if ($item['verb'] == ACTIVITY_LIKE) { + if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) { + if ($item['verb'] == Activity::LIKE) { + Logger::debug('mailstream: like item ' . $item['id']); return; } } - $message_id = mailstream_generate_id($a, $item['uri']); - q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " . - "VALUES (%d, '%s', '%s', '%s')", intval($item['uid']), - intval($item['contact-id']), DBA::escape($item['uri']), DBA::escape($message_id)); - $r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), DBA::escape($item['uri'])); + $message_id = mailstream_generate_id($item['uri']); + q( + "INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " . + "VALUES (%d, '%s', '%s', '%s')", + intval($item['uid']), + intval($item['contact-id']), + DBA::escape($item['uri']), + DBA::escape($message_id) + ); + $r = q( + 'SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', + intval($item['uid']), + intval($item['contact-id']), + DBA::escape($item['uri']) + ); if (count($r) != 1) { - logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_NORMAL); + Logger::info('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item'); return; } $ms_item = $r[0]; - logger('mailstream_post_remote_hook: created mailstream_item ' - . $ms_item['id'] . ' for item ' . $item['uri'] . ' ' - . $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA); + Logger::debug('mailstream_post_remote_hook: created mailstream_item ' . $ms_item['id'] . + ' for item ' . $item['uri'] . ' ' . $item['uid'] . ' ' . $item['contact-id']); $user = mailstream_get_user($item['uid']); if (!$user) { - logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_NORMAL); + Logger::info('mailstream_post_remote_hook: no user ' . $item['uid']); return; } - mailstream_send($a, $ms_item['message-id'], $item, $user); + mailstream_send($ms_item['message-id'], $item, $user); } -function mailstream_get_user($uid) { +/** + * Converts a user ID into a full user record from the corresponding database table + * + * @param int $uid ID of the user to query + * + * @return array results from the user table + */ +function mailstream_get_user($uid) +{ $r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid)); if (count($r) != 1) { - logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_NORMAL); + Logger::info('mailstream_post_remote_hook: Unexpected number of users returned'); return; } return $r[0]; } -function mailstream_do_images($a, &$item, &$attachments) { - if (!PConfig::get($item['uid'], 'mailstream', 'attachimg')) { +/** + * If the user has configured attaching images to emails as + * attachments, this function searches the post for such images, + * retrieves the image, and inserts the data and metadata into the + * supplied array + * + * @param array $item content of the item + * @param array $attachments contains an array element for each attachment to add to the email + * + * @return array new value of the attachments table (results are also stored in the reference parameter) + */ +function mailstream_do_images(&$item, &$attachments) +{ + if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) { return; } $attachments = []; - $baseurl = $a->get_baseurl(); preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1); preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2); - foreach (array_merge($matches1[3], $matches2[1]) as $url) { - $redirects; + preg_match_all("/\[img\=([^\]]*)\]([^[]*)\[\/img\]/ism", $item["body"], $matches3); + foreach (array_merge($matches1[3], $matches2[1], $matches3[1]) as $url) { + $components = parse_url($url); + if (!$components) { + continue; + } $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); + $curlResult = DI::httpRequest()->fetchFull($url, 0, '', $cookiejar); $attachments[$url] = [ - 'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar), + 'data' => $curlResult->getBody(), 'guid' => hash("crc32", $url), - 'filename' => basename($url), - 'type' => $a->get_curl_content_type()]; + 'filename' => basename($components['path']), + 'type' => $curlResult->getContentType() + ]; + if (strlen($attachments[$url]['data'])) { $item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']); continue; @@ -171,7 +240,15 @@ function mailstream_do_images($a, &$item, &$attachments) { return $attachments; } -function mailstream_sender($item) { +/** + * Creates a sender to use in the email, either from the contact or the author of the item, or both + * + * @param array $item content of the item + * + * @return string sender suitable for use in the email + */ +function mailstream_sender($item) +{ $r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']); if (DBA::isResult($r)) { $contact = $r[0]; @@ -182,7 +259,15 @@ function mailstream_sender($item) { return $item['author-name']; } -function mailstream_decode_subject($subject) { +/** + * Converts a bbcode-encoded subject line into a plaintext version suitable for the subject line of an email + * + * @param string $subject bbcode-encoded subject line + * + * @return string plaintext subject line + */ +function mailstream_decode_subject($subject) +{ $html = BBCode::convert($subject); if (!$html) { return $subject; @@ -195,7 +280,9 @@ function mailstream_decode_subject($subject) { if (!$noentity) { return $notags; } - $nocodes = preg_replace_callback("/(&#[0-9]+;)/", function($m) { return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); }, $noentity); + $nocodes = preg_replace_callback("/(&#[0-9]+;)/", function ($m) { + return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); + }, $noentity); if (!$nocodes) { return $noentity; } @@ -206,14 +293,22 @@ function mailstream_decode_subject($subject) { return $trimmed; } -function mailstream_subject($item) { +/** + * Creates a subject line to use in the email + * + * @param array $item content of the item + * + * @return string subject line suitable for use in the email + */ +function mailstream_subject($item) +{ if ($item['title']) { return mailstream_decode_subject($item['title']); } $parent = $item['thr-parent']; // Don't look more than 100 levels deep for a subject, in case of loops for ($i = 0; ($i < 100) && $parent; $i++) { - $parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]); + $parent_item = Post::selectFirst(['thr-parent', 'title'], ['uri' => $parent]); if (!DBA::isResult($parent_item)) { break; } @@ -221,18 +316,28 @@ function mailstream_subject($item) { break; } if ($parent_item['title']) { - return L10n::t('Re:') . ' ' . mailstream_decode_subject($parent_item['title']); + return DI::l10n()->t('Re:') . ' ' . mailstream_decode_subject($parent_item['title']); } $parent = $parent_item['thr-parent']; } - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", - intval($item['contact-id']), intval($item['uid'])); + $r = q( + "SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", + intval($item['contact-id']), + intval($item['uid']) + ); + if (!DBA::isResult($r)) { + Logger::error( + 'mailstream_subject no contact for item', + ['item id' => $item['id'], 'plink' => $item['plink'], 'contact id' => $item['contact-id'], 'uid' => $item['uid']] + ); + return DI::l10n()->t("Friendica post"); + } $contact = $r[0]; if ($contact['network'] === 'dfrn') { - return L10n::t("Friendica post"); + return DI::l10n()->t("Friendica post"); } if ($contact['network'] === 'dspr') { - return L10n::t("Diaspora post"); + return DI::l10n()->t("Diaspora post"); } if ($contact['network'] === 'face') { $text = mailstream_decode_subject($item['body']); @@ -242,15 +347,23 @@ function mailstream_subject($item) { return preg_replace('/\\s+/', ' ', $subject); } if ($contact['network'] === 'feed') { - return L10n::t("Feed item"); + return DI::l10n()->t("Feed item"); } if ($contact['network'] === 'mail') { - return L10n::t("Email"); + return DI::l10n()->t("Email"); } - return L10n::t("Friendica Item"); + return DI::l10n()->t("Friendica Item"); } -function mailstream_send($a, $message_id, $item, $user) { +/** + * Sends a message using PHPMailer + * + * @param string $message_id ID of the message (RFC 1036) + * @param array $item content of the item + * @param array $user results from the user table + */ +function mailstream_send($message_id, $item, $user) +{ if (!$item['visible']) { return; } @@ -260,12 +373,12 @@ function mailstream_send($a, $message_id, $item, $user) { require_once(dirname(__file__).'/phpmailer/class.phpmailer.php'); $attachments = []; - mailstream_do_images($a, $item, $attachments); - $frommail = Config::get('mailstream', 'frommail'); + mailstream_do_images($item, $attachments); + $frommail = DI::config()->get('mailstream', 'frommail'); if ($frommail == "") { $frommail = 'friendica@localhost.local'; } - $address = PConfig::get($item['uid'], 'mailstream', 'address'); + $address = DI::pConfig()->get($item['uid'], 'mailstream', 'address'); if (!$address) { $address = $user['email']; } @@ -277,32 +390,39 @@ function mailstream_send($a, $message_id, $item, $user) { $mail->MessageID = $message_id; $mail->Subject = mailstream_subject($item); if ($item['thr-parent'] != $item['uri']) { - $mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($a, $item['thr-parent'])); + $mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($item['thr-parent'])); } $mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']); $mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']); $encoding = 'base64'; foreach ($attachments as $url => $image) { - $mail->AddStringEmbeddedImage($image['data'], $image['guid'], $image['filename'], $encoding, $image['type']); + $mail->AddStringEmbeddedImage( + $image['data'], + $image['guid'], + $image['filename'], + $encoding, + $image['type'] + ); } $mail->IsHTML(true); $mail->CharSet = 'utf-8'; - $template = get_markup_template('mail.tpl', 'addon/mailstream/'); - $item['body'] = BBCode::convert($item['body']); - $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id']; - $mail->Body = replace_macros($template, [ - '$upstream' => L10n::t('Upstream'), - '$local' => L10n::t('Local'), + $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/'); + $mail->AltBody = BBCode::toPlaintext($item['body']); + $item['body'] = BBCode::convert($item['body'], false, BBCode::CONNECTORS); + $item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid']; + $mail->Body = Renderer::replaceMacros($template, [ + '$upstream' => DI::l10n()->t('Upstream'), + '$local' => DI::l10n()->t('Local'), '$item' => $item]); mailstream_html_wrap($mail->Body); if (!$mail->Send()) { throw new Exception($mail->ErrorInfo); } - logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG); + Logger::debug('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject); } catch (phpmailerException $e) { - logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_NORMAL); + Logger::debug('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage()); } catch (Exception $e) { - logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_NORMAL); + Logger::debug('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage()); } // In case of failure, still set the item to completed. Otherwise // we'll just try to send it over and over again and it'll fail @@ -314,6 +434,8 @@ function mailstream_send($a, $message_id, $item, $user) { * Email tends to break if you send excessively long lines. To make * bbcode's output suitable for transmission, we try to break things * up so that lines are about 200 characters. + * + * @param string $text text to word wrap - modified in-place */ function mailstream_html_wrap(&$text) { @@ -324,93 +446,146 @@ function mailstream_html_wrap(&$text) $text = implode($lines); } -function mailstream_cron($a, $b) { +/** + * Cron job for the mailstream plugin. Sends delayed messages and cleans up old successful entries from the table. + */ +function mailstream_cron() +{ // Only process items older than an hour in cron. This is because // we want to give mailstream_post_remote_hook a fair chance to // send the email itself before cron jumps in. Only if // mailstream_post_remote_hook fails for some reason will this get // used, and in that case it's worth holding off a bit anyway. - $ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100"); - logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG); - foreach ($ms_item_ids as $ms_item_id) { - if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) { - logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_NORMAL); - } - $item = Item::selectFirst([], ['id' => $ms_item_id['id']]); - $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid'])); - $user = $users[0]; - if ($user && $item) { - mailstream_send($a, $ms_item_id['message-id'], $item, $user); - } - else { - logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_NORMAL); - q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id'])); + $query = <<< EOT +SELECT + `mailstream_item`.`message-id`, + `mailstream_item`.`uri`, + `post-user-view`.`id` +FROM + `mailstream_item` + JOIN + `post-user-view` + ON ( + `mailstream_item`.`uid` = `post-user-view`.`uid` AND + `mailstream_item`.`uri` = `post-user-view`.`uri` AND + `mailstream_item`.`contact-id` = `post-user-view`.`contact-id` + ) +WHERE + `mailstream_item`.`completed` IS NULL AND + `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND + `post-user-view`.`visible` = 1 +ORDER BY `mailstream_item`.`created` +LIMIT 100 + +EOT; + $ms_item_ids = q($query); + if (DBA::isResult($ms_item_ids)) { + Logger::debug('mailstream_cron processing ' . count($ms_item_ids) . ' items'); + foreach ($ms_item_ids as $ms_item_id) { + if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) { + Logger::info('mailstream_cron: Item ' . $ms_item_id['id'] . + ' URI ' . $ms_item_id['uri'] . ' has no message-id'); + } + $item = Post::selectFirst([], ['id' => $ms_item_id['id']]); + $users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid'])); + $user = $users[0]; + if ($user && $item) { + mailstream_send($ms_item_id['message-id'], $item, $user); + } else { + Logger::info('mailstream_cron: Unable to find item ' . $ms_item_id['id']); + q( + "UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", + intval($ms_item_id['message-id']) + ); + } } } mailstream_tidy(); } -function mailstream_addon_settings(&$a,&$s) { - $enabled = PConfig::get(local_user(), 'mailstream', 'enabled'); - $address = PConfig::get(local_user(), 'mailstream', 'address'); - $nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes'); - $attachimg= PConfig::get(local_user(), 'mailstream', 'attachimg'); - $template = get_markup_template('settings.tpl', 'addon/mailstream/'); - $s .= replace_macros($template, [ +/** + * Form for configuring mailstream features for a user + * + * @param Friendica\App $a App object + * @param string $o HTML form data + */ +function mailstream_addon_settings(&$a, &$s) +{ + $enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled'); + $address = DI::pConfig()->get(local_user(), 'mailstream', 'address'); + $nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes'); + $attachimg= DI::pConfig()->get(local_user(), 'mailstream', 'attachimg'); + $template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/'); + $s .= Renderer::replaceMacros($template, [ '$enabled' => [ 'mailstream_enabled', - L10n::t('Enabled'), + DI::l10n()->t('Enabled'), $enabled], '$address' => [ 'mailstream_address', - L10n::t('Email Address'), + DI::l10n()->t('Email Address'), $address, - L10n::t("Leave blank to use your account email address")], + DI::l10n()->t("Leave blank to use your account email address")], '$nolikes' => [ 'mailstream_nolikes', - L10n::t('Exclude Likes'), + DI::l10n()->t('Exclude Likes'), $nolikes, - L10n::t("Check this to omit mailing \"Like\" notifications")], + DI::l10n()->t("Check this to omit mailing \"Like\" notifications")], '$attachimg' => [ 'mailstream_attachimg', - L10n::t('Attach Images'), + DI::l10n()->t('Attach Images'), $attachimg, - L10n::t("Download images in posts and attach them to the email. Useful for reading email while offline.")], - '$title' => L10n::t('Mail Stream Settings'), - '$submit' => L10n::t('Save Settings')]); + DI::l10n()->t("Download images in posts and attach them to the email. " . + "Useful for reading email while offline.")], + '$title' => DI::l10n()->t('Mail Stream Settings'), + '$submit' => DI::l10n()->t('Save Settings')]); } -function mailstream_addon_settings_post($a,$post) { +/** + * Process data submitted to user's mailstream features form + */ +function mailstream_addon_settings_post() +{ if ($_POST['mailstream_address'] != "") { - PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); - } - else { - PConfig::delete(local_user(), 'mailstream', 'address'); + DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); + } else { + DI::pConfig()->delete(local_user(), 'mailstream', 'address'); } if ($_POST['mailstream_nolikes']) { - PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); - } - else { - PConfig::delete(local_user(), 'mailstream', 'nolikes'); + DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']); + } else { + DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes'); } if ($_POST['mailstream_enabled']) { - PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); - } - else { - PConfig::delete(local_user(), 'mailstream', 'enabled'); + DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']); + } else { + DI::pConfig()->delete(local_user(), 'mailstream', 'enabled'); } if ($_POST['mailstream_attachimg']) { - PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); - } - else { - PConfig::delete(local_user(), 'mailstream', 'attachimg'); + DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']); + } else { + DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg'); } } -function mailstream_tidy() { - $r = q("SELECT id FROM mailstream_item WHERE completed IS NOT NULL AND completed < DATE_SUB(NOW(), INTERVAL 1 YEAR)"); +/** + * Deletes records from the mailstream_item table older than one year + */ +function mailstream_tidy() +{ + $query = <<< EOT +SELECT + id +FROM + mailstream_item +WHERE + completed IS NOT NULL AND + completed < DATE_SUB(NOW(), INTERVAL 1 YEAR) + +EOT; + $r = q($query); foreach ($r as $rr) { q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id'])); } - logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG); + Logger::debug('mailstream_tidy: deleted ' . count($r) . ' old items'); }