* Author: Matthew Exon <http://mat.exon.name>
*/
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
+
function mailstream_install() {
- register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings');
- register_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post');
- register_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
- register_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
- register_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
+ 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');
- if (get_config('mailstream', 'dbversion') == '0.1') {
+ if (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');
- set_config('mailstream', 'dbversion', '0.2');
+ Config::set('mailstream', 'dbversion', '0.2');
}
- if (get_config('mailstream', 'dbversion') == '0.2') {
+ if (Config::get('mailstream', 'dbversion') == '0.2') {
q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"');
- set_config('mailstream', 'dbversion', '0.3');
+ Config::set('mailstream', 'dbversion', '0.3');
}
- if (get_config('mailstream', 'dbversion') == '0.3') {
+ if (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');
- set_config('mailstream', 'dbversion', '0.4');
+ Config::set('mailstream', 'dbversion', '0.4');
}
- if (get_config('mailstream', 'dbversion') == '0.4') {
+ if (Config::get('mailstream', 'dbversion') == '0.4') {
q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin');
- set_config('mailstream', 'dbversion', '0.5');
+ Config::set('mailstream', 'dbversion', '0.5');
}
- if (get_config('mailstream', 'dbversion') == '0.5') {
- set_config('mailstream', 'dbversion', '1.0');
+ if (Config::get('mailstream', 'dbversion') == '0.5') {
+ Config::set('mailstream', 'dbversion', '1.0');
}
- if (get_config('retriever', 'dbversion') != '1.0') {
+ if (Config::get('retriever', 'dbversion') != '1.0') {
$schema = file_get_contents(dirname(__file__).'/database.sql');
$arr = explode(';', $schema);
foreach ($arr as $a) {
$r = q($a);
}
- set_config('mailstream', 'dbversion', '1.0');
+ Config::set('mailstream', 'dbversion', '1.0');
}
}
function mailstream_uninstall() {
- unregister_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings');
- unregister_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post');
- unregister_hook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
- unregister_hook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
- unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
- unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
- unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
- unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
- unregister_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
- unregister_hook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
+ 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');
}
function mailstream_module() {}
-function mailstream_plugin_admin(&$a,&$o) {
- $frommail = get_config('mailstream', 'frommail');
+function mailstream_addon_admin(&$a,&$o) {
+ $frommail = Config::get('mailstream', 'frommail');
$template = get_markup_template('admin.tpl', 'addon/mailstream/');
- $config = array('frommail',
- t('From Address'),
+ $config = ['frommail',
+ L10n::t('From Address'),
$frommail,
- t('Email address that stream items will appear to be from.'));
- $o .= replace_macros($template, array(
+ L10n::t('Email address that stream items will appear to be from.')];
+ $o .= replace_macros($template, [
'$frommail' => $config,
- '$submit' => t('Save Settings')));
+ '$submit' => L10n::t('Save Settings')]);
}
-function mailstream_plugin_admin_post ($a) {
+function mailstream_addon_admin_post ($a) {
if (x($_POST, 'frommail')) {
- set_config('mailstream', 'frommail', $_POST['frommail']);
+ Config::set('mailstream', 'frommail', $_POST['frommail']);
}
}
function mailstream_generate_id($a, $uri) {
// http://www.jwz.org/doc/mid.html
- $host = $a->get_hostname();
+ $host = $a->getHostName();
$resource = hash('md5', $uri);
$message_id = "<" . $resource . "@" . $host . ">";
logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);
}
function mailstream_post_hook(&$a, &$item) {
- if (!get_pconfig($item['uid'], 'mailstream', 'enabled')) {
+ if (!PConfig::get($item['uid'], 'mailstream', 'enabled')) {
return;
}
if (!$item['uid']) {
if (!$item['uri']) {
return;
}
- if (get_pconfig($item['uid'], 'mailstream', 'nolikes')) {
+ if (PConfig::get($item['uid'], 'mailstream', 'nolikes')) {
if ($item['verb'] == ACTIVITY_LIKE) {
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']), dbesc($item['uri']), dbesc($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']), dbesc($item['uri']));
+ 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('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_INFO);
return;
}
$ms_item = $r[0];
. $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA);
$user = mailstream_get_user($item['uid']);
if (!$user) {
- logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_NORMAL);
+ logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_INFO);
return;
}
mailstream_send($a, $ms_item['message-id'], $item, $user);
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('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_INFO);
return;
}
return $r[0];
}
function mailstream_do_images($a, &$item, &$attachments) {
- if (!get_pconfig($item['uid'], 'mailstream', 'attachimg')) {
+ if (!PConfig::get($item['uid'], 'mailstream', 'attachimg')) {
return;
}
- $attachments = array();
- $baseurl = $a->get_baseurl();
+ $attachments = [];
+ $baseurl = $a->getBaseURL();
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;
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
- $attachments[$url] = array(
- 'data' => fetch_url($url, true, $redirects, 0, Null, $cookiejar),
+ $attachments[$url] = [
+ 'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar),
'guid' => hash("crc32", $url),
'filename' => basename($url),
- 'type' => $a->get_curl_content_type());
+ 'type' => $a->get_curl_content_type()];
if (strlen($attachments[$url]['data'])) {
$item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']);
continue;
function mailstream_sender($item) {
$r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
- if (dbm::is_result($r)) {
+ if (DBA::isResult($r)) {
$contact = $r[0];
if ($contact['name'] != $item['author-name']) {
return $contact['name'] . ' - ' . $item['author-name'];
}
function mailstream_decode_subject($subject) {
- $html = bbcode($subject);
+ $html = BBCode::convert($subject);
if (!$html) {
return $subject;
}
$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++) {
- $r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent));
- if (!dbm::is_result($r)) {
+ $parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
+ if (!DBA::isResult($parent_item)) {
break;
}
- if ($r[0]['thr-parent'] === $parent) {
+ if ($parent_item['thr-parent'] === $parent) {
break;
}
- if ($r[0]['title']) {
- return t('Re:') . ' ' . mailstream_decode_subject($r[0]['title']);
+ if ($parent_item['title']) {
+ return L10n::t('Re:') . ' ' . mailstream_decode_subject($parent_item['title']);
}
- $parent = $r[0]['thr-parent'];
+ $parent = $parent_item['thr-parent'];
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
intval($item['contact-id']), intval($item['uid']));
$contact = $r[0];
if ($contact['network'] === 'dfrn') {
- return t("Friendica post");
+ return L10n::t("Friendica post");
}
if ($contact['network'] === 'dspr') {
- return t("Diaspora post");
+ return L10n::t("Diaspora post");
}
if ($contact['network'] === 'face') {
$text = mailstream_decode_subject($item['body']);
return preg_replace('/\\s+/', ' ', $subject);
}
if ($contact['network'] === 'feed') {
- return t("Feed item");
+ return L10n::t("Feed item");
}
if ($contact['network'] === 'mail') {
- return t("Email");
+ return L10n::t("Email");
}
- return t("Friendica Item");
+ return L10n::t("Friendica Item");
}
function mailstream_send($a, $message_id, $item, $user) {
return;
}
require_once(dirname(__file__).'/phpmailer/class.phpmailer.php');
- require_once('include/bbcode.php');
- $attachments = array();
+
+ $attachments = [];
mailstream_do_images($a, $item, $attachments);
- $frommail = get_config('mailstream', 'frommail');
+ $frommail = Config::get('mailstream', 'frommail');
if ($frommail == "") {
$frommail = 'friendica@localhost.local';
}
- $address = get_pconfig($item['uid'], 'mailstream', 'address');
+ $address = PConfig::get($item['uid'], 'mailstream', 'address');
if (!$address) {
$address = $user['email'];
}
$mail = new PHPmailer;
try {
- $mail->XMailer = 'Friendica Mailstream Plugin';
+ $mail->XMailer = 'Friendica Mailstream Addon';
$mail->SetFrom($frommail, mailstream_sender($item));
$mail->AddAddress($address, $user['username']);
$mail->MessageID = $message_id;
$mail->IsHTML(true);
$mail->CharSet = 'utf-8';
$template = get_markup_template('mail.tpl', 'addon/mailstream/');
- $item['body'] = bbcode($item['body']);
- $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id'];
- $mail->Body = replace_macros($template, array(
- '$upstream' => t('Upstream'),
- '$local' => t('Local'),
- '$item' => $item));
+ $item['body'] = BBCode::convert($item['body']);
+ $item['url'] = $a->getBaseURL() . '/display/' . $user['nickname'] . '/' . $item['id'];
+ $mail->Body = replace_macros($template, [
+ '$upstream' => L10n::t('Upstream'),
+ '$local' => 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);
} catch (phpmailerException $e) {
- logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_NORMAL);
+ logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_INFO);
} catch (Exception $e) {
- logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_NORMAL);
+ logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_INFO);
}
// 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
// every time.
- q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', dbesc($message_id));
+ q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', DBA::escape($message_id));
}
/**
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);
+ logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_INFO);
}
- $items = q('SELECT * FROM `item` WHERE `id` = %d', $ms_item_id['id']);
- $item = $items[0];
+ $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);
+ logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_INFO);
q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
}
}
mailstream_tidy();
}
-function mailstream_plugin_settings(&$a,&$s) {
- $enabled = get_pconfig(local_user(), 'mailstream', 'enabled');
- $address = get_pconfig(local_user(), 'mailstream', 'address');
- $nolikes = get_pconfig(local_user(), 'mailstream', 'nolikes');
- $attachimg= get_pconfig(local_user(), 'mailstream', 'attachimg');
+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, array(
- '$enabled' => array(
+ $s .= replace_macros($template, [
+ '$enabled' => [
'mailstream_enabled',
- t('Enabled'),
- $enabled),
- '$address' => array(
+ L10n::t('Enabled'),
+ $enabled],
+ '$address' => [
'mailstream_address',
- t('Email Address'),
+ L10n::t('Email Address'),
$address,
- t("Leave blank to use your account email address")),
- '$nolikes' => array(
+ L10n::t("Leave blank to use your account email address")],
+ '$nolikes' => [
'mailstream_nolikes',
- t('Exclude Likes'),
+ L10n::t('Exclude Likes'),
$nolikes,
- t("Check this to omit mailing \"Like\" notifications")),
- '$attachimg' => array(
+ L10n::t("Check this to omit mailing \"Like\" notifications")],
+ '$attachimg' => [
'mailstream_attachimg',
- t('Attach Images'),
+ L10n::t('Attach Images'),
$attachimg,
- t("Download images in posts and attach them to the email. Useful for reading email while offline.")),
- '$title' => t('Mail Stream Settings'),
- '$submit' => t('Save Settings')));
+ 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')]);
}
-function mailstream_plugin_settings_post($a,$post) {
+function mailstream_addon_settings_post($a,$post) {
if ($_POST['mailstream_address'] != "") {
- set_pconfig(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
+ PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
}
else {
- del_pconfig(local_user(), 'mailstream', 'address');
+ PConfig::delete(local_user(), 'mailstream', 'address');
}
if ($_POST['mailstream_nolikes']) {
- set_pconfig(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
+ PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
}
else {
- del_pconfig(local_user(), 'mailstream', 'nolikes');
+ PConfig::delete(local_user(), 'mailstream', 'nolikes');
}
if ($_POST['mailstream_enabled']) {
- set_pconfig(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
+ PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
}
else {
- del_pconfig(local_user(), 'mailstream', 'enabled');
+ PConfig::delete(local_user(), 'mailstream', 'enabled');
}
if ($_POST['mailstream_attachimg']) {
- set_pconfig(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
+ PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
}
else {
- del_pconfig(local_user(), 'mailstream', 'attachimg');
+ PConfig::delete(local_user(), 'mailstream', 'attachimg');
}
}
projects / friendica-addons.git / blobdiff