*/
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
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_module() {}
function mailstream_addon_admin(&$a,&$o) {
- $frommail = Config::get('mailstream', 'frommail');
+ $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.')];
+ 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 (!empty($_POST['frommail'])) {
- Config::set('mailstream', 'frommail', $_POST['frommail']);
+ DI::config()->set('mailstream', 'frommail', $_POST['frommail']);
}
}
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'];
}
intval($item['contact-id']), intval($item['uid']));
$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']);
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(\Friendica\App $a, $message_id, $item, $user) {
$attachments = [];
mailstream_do_images($a, $item, $attachments);
- $frommail = Config::get('mailstream', 'frommail');
+ $frommail = DI::config()->get('mailstream', 'frommail');
if ($frommail == "") {
$frommail = 'friendica@localhost.local';
}
$item['body'] = BBCode::convert($item['body']);
$item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid'];
$mail->Body = Renderer::replaceMacros($template, [
- '$upstream' => L10n::t('Upstream'),
- '$local' => L10n::t('Local'),
+ '$upstream' => DI::l10n()->t('Upstream'),
+ '$local' => DI::l10n()->t('Local'),
'$item' => $item]);
mailstream_html_wrap($mail->Body);
if (!$mail->Send()) {
$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) {
if ($_POST['mailstream_address'] != "") {
- PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
+ DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
}
else {
- PConfig::delete(local_user(), 'mailstream', 'address');
+ DI::pConfig()->delete(local_user(), 'mailstream', 'address');
}
if ($_POST['mailstream_nolikes']) {
- PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
+ DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
}
else {
- PConfig::delete(local_user(), 'mailstream', 'nolikes');
+ DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes');
}
if ($_POST['mailstream_enabled']) {
- PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
+ DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
}
else {
- PConfig::delete(local_user(), 'mailstream', 'enabled');
+ DI::pConfig()->delete(local_user(), 'mailstream', 'enabled');
}
if ($_POST['mailstream_attachimg']) {
- PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
+ DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
}
else {
- PConfig::delete(local_user(), 'mailstream', 'attachimg');
+ DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg');
}
}
projects / friendica-addons.git / blobdiff