mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-10-10 08:52:59 +00:00
Merge branch '3.6-rc'
This commit is contained in:
Tobias Diekershoff
commit
39dd3dffe0
733 changed files with 10943 additions and 8237 deletions
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-06-23 14:45+0200\n"
|
||||
"POT-Creation-Date: 2018-03-11 19:13+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -17,62 +17,80 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: mailstream.php:55
|
||||
#: mailstream.php:77
|
||||
msgid "From Address"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:57
|
||||
#: mailstream.php:79
|
||||
msgid "Email address that stream items will appear to be from."
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:60 mailstream.php:282
|
||||
#: mailstream.php:82 mailstream.php:380
|
||||
msgid "Save Settings"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:165
|
||||
#: mailstream.php:223
|
||||
msgid "Re:"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:173
|
||||
#: mailstream.php:231
|
||||
msgid "Friendica post"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:176
|
||||
#: mailstream.php:234
|
||||
msgid "Diaspora post"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:183
|
||||
#: mailstream.php:244
|
||||
msgid "Feed item"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:186
|
||||
#: mailstream.php:247
|
||||
msgid "Email"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:188
|
||||
#: mailstream.php:249
|
||||
msgid "Friendica Item"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:229
|
||||
#: mailstream.php:293
|
||||
msgid "Upstream"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:230
|
||||
#: mailstream.php:294
|
||||
msgid "Local"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:274
|
||||
msgid "Email Address"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:276
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:279
|
||||
#: mailstream.php:362
|
||||
msgid "Enabled"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:281
|
||||
#: mailstream.php:366
|
||||
msgid "Email Address"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:368
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:371
|
||||
msgid "Exclude Likes"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:373
|
||||
msgid "Check this to omit mailing \"Like\" notifications"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:376
|
||||
msgid "Attach Images"
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:378
|
||||
msgid ""
|
||||
"Download images in posts and attach them to the email. Useful for reading "
|
||||
"email while offline."
|
||||
msgstr ""
|
||||
|
||||
#: mailstream.php:379
|
||||
msgid "Mail Stream Settings"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -4,77 +4,96 @@
|
|||
#
|
||||
#
|
||||
# Translators:
|
||||
# Abrax <webmaster@a-zwenkau.de>, 2014
|
||||
# Andreas H., 2014
|
||||
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: friendica\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-06-23 14:45+0200\n"
|
||||
"PO-Revision-Date: 2014-10-14 09:25+0000\n"
|
||||
"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
|
||||
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
|
||||
"POT-Creation-Date: 2018-03-11 19:13+0100\n"
|
||||
"PO-Revision-Date: 2018-03-16 07:45+0000\n"
|
||||
"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
|
||||
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: de\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: mailstream.php:55
|
||||
#: mailstream.php:77
|
||||
msgid "From Address"
|
||||
msgstr "Absender"
|
||||
|
||||
#: mailstream.php:57
|
||||
#: mailstream.php:79
|
||||
msgid "Email address that stream items will appear to be from."
|
||||
msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
|
||||
|
||||
#: mailstream.php:60 mailstream.php:282
|
||||
#: mailstream.php:82 mailstream.php:380
|
||||
msgid "Save Settings"
|
||||
msgstr "Einstellungen speichern"
|
||||
|
||||
#: mailstream.php:165
|
||||
#: mailstream.php:223
|
||||
msgid "Re:"
|
||||
msgstr "Re:"
|
||||
|
||||
#: mailstream.php:173
|
||||
#: mailstream.php:231
|
||||
msgid "Friendica post"
|
||||
msgstr "Friendica Veröffentlichung"
|
||||
|
||||
#: mailstream.php:176
|
||||
#: mailstream.php:234
|
||||
msgid "Diaspora post"
|
||||
msgstr "Diaspora Veröffentlichung"
|
||||
|
||||
#: mailstream.php:183
|
||||
#: mailstream.php:244
|
||||
msgid "Feed item"
|
||||
msgstr "Artikel-Feed"
|
||||
|
||||
#: mailstream.php:186
|
||||
#: mailstream.php:247
|
||||
msgid "Email"
|
||||
msgstr "E-Mail"
|
||||
|
||||
#: mailstream.php:188
|
||||
#: mailstream.php:249
|
||||
msgid "Friendica Item"
|
||||
msgstr "Friendica Artikel"
|
||||
|
||||
#: mailstream.php:229
|
||||
#: mailstream.php:293
|
||||
msgid "Upstream"
|
||||
msgstr "Upstream"
|
||||
|
||||
#: mailstream.php:230
|
||||
#: mailstream.php:294
|
||||
msgid "Local"
|
||||
msgstr "Lokal"
|
||||
|
||||
#: mailstream.php:274
|
||||
msgid "Email Address"
|
||||
msgstr "E-Mail-Adresse"
|
||||
|
||||
#: mailstream.php:276
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr "Leer lassen für Deine Konto-E-Mail-Addresse"
|
||||
|
||||
#: mailstream.php:279
|
||||
#: mailstream.php:362
|
||||
msgid "Enabled"
|
||||
msgstr "eingeschaltet"
|
||||
|
||||
#: mailstream.php:281
|
||||
#: mailstream.php:366
|
||||
msgid "Email Address"
|
||||
msgstr "E-Mail-Adresse"
|
||||
|
||||
#: mailstream.php:368
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr "Leer lassen für Deine Konto-E-Mail-Addresse"
|
||||
|
||||
#: mailstream.php:371
|
||||
msgid "Exclude Likes"
|
||||
msgstr "Likes ignorieren"
|
||||
|
||||
#: mailstream.php:373
|
||||
msgid "Check this to omit mailing \"Like\" notifications"
|
||||
msgstr "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail."
|
||||
|
||||
#: mailstream.php:376
|
||||
msgid "Attach Images"
|
||||
msgstr "Bolder anhängen"
|
||||
|
||||
#: mailstream.php:378
|
||||
msgid ""
|
||||
"Download images in posts and attach them to the email. Useful for reading "
|
||||
"email while offline."
|
||||
msgstr "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?"
|
||||
|
||||
#: mailstream.php:379
|
||||
msgid "Mail Stream Settings"
|
||||
msgstr "Mail-Nachrichten Einstellungen"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ $a->strings["Email"] = "E-Mail";
|
|||
$a->strings["Friendica Item"] = "Friendica Artikel";
|
||||
$a->strings["Upstream"] = "Upstream";
|
||||
$a->strings["Local"] = "Lokal";
|
||||
$a->strings["Enabled"] = "eingeschaltet";
|
||||
$a->strings["Email Address"] = "E-Mail-Adresse";
|
||||
$a->strings["Leave blank to use your account email address"] = "Leer lassen für Deine Konto-E-Mail-Addresse";
|
||||
$a->strings["Enabled"] = "eingeschaltet";
|
||||
$a->strings["Exclude Likes"] = "Likes ignorieren";
|
||||
$a->strings["Check this to omit mailing \"Like\" notifications"] = "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail.";
|
||||
$a->strings["Attach Images"] = "Bolder anhängen";
|
||||
$a->strings["Download images in posts and attach them to the email. Useful for reading email while offline."] = "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?";
|
||||
$a->strings["Mail Stream Settings"] = "Mail-Nachrichten Einstellungen";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
#
|
||||
#
|
||||
# Translators:
|
||||
# fabrixxm <fabrix.xm@gmail.com>, 2014
|
||||
# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: friendica\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2014-06-23 14:45+0200\n"
|
||||
"PO-Revision-Date: 2014-09-10 13:02+0000\n"
|
||||
"POT-Creation-Date: 2018-03-11 19:13+0100\n"
|
||||
"PO-Revision-Date: 2018-03-19 13:12+0000\n"
|
||||
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
|
||||
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -19,62 +19,80 @@ msgstr ""
|
|||
"Language: it\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: mailstream.php:55
|
||||
#: mailstream.php:77
|
||||
msgid "From Address"
|
||||
msgstr "Indirizzo di invio"
|
||||
|
||||
#: mailstream.php:57
|
||||
#: mailstream.php:79
|
||||
msgid "Email address that stream items will appear to be from."
|
||||
msgstr "Indirizzo email da cui i messaggi appariranno inviati"
|
||||
|
||||
#: mailstream.php:60 mailstream.php:282
|
||||
#: mailstream.php:82 mailstream.php:380
|
||||
msgid "Save Settings"
|
||||
msgstr "Salva Impostazioni"
|
||||
|
||||
#: mailstream.php:165
|
||||
#: mailstream.php:223
|
||||
msgid "Re:"
|
||||
msgstr "R:"
|
||||
|
||||
#: mailstream.php:173
|
||||
#: mailstream.php:231
|
||||
msgid "Friendica post"
|
||||
msgstr "Messaggio Friendica"
|
||||
|
||||
#: mailstream.php:176
|
||||
#: mailstream.php:234
|
||||
msgid "Diaspora post"
|
||||
msgstr "Messaggio Diaspora"
|
||||
|
||||
#: mailstream.php:183
|
||||
#: mailstream.php:244
|
||||
msgid "Feed item"
|
||||
msgstr "Elemento da feed"
|
||||
|
||||
#: mailstream.php:186
|
||||
#: mailstream.php:247
|
||||
msgid "Email"
|
||||
msgstr "Email"
|
||||
|
||||
#: mailstream.php:188
|
||||
#: mailstream.php:249
|
||||
msgid "Friendica Item"
|
||||
msgstr "Elemento da Friendica"
|
||||
|
||||
#: mailstream.php:229
|
||||
#: mailstream.php:293
|
||||
msgid "Upstream"
|
||||
msgstr "Upstream"
|
||||
|
||||
#: mailstream.php:230
|
||||
#: mailstream.php:294
|
||||
msgid "Local"
|
||||
msgstr "Locale"
|
||||
|
||||
#: mailstream.php:274
|
||||
msgid "Email Address"
|
||||
msgstr "Indirizzo Email"
|
||||
|
||||
#: mailstream.php:276
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr "Lascia in bianco per usare l'indirizzo email del tuo account"
|
||||
|
||||
#: mailstream.php:279
|
||||
#: mailstream.php:362
|
||||
msgid "Enabled"
|
||||
msgstr "Abilitato"
|
||||
|
||||
#: mailstream.php:281
|
||||
#: mailstream.php:366
|
||||
msgid "Email Address"
|
||||
msgstr "Indirizzo Email"
|
||||
|
||||
#: mailstream.php:368
|
||||
msgid "Leave blank to use your account email address"
|
||||
msgstr "Lascia in bianco per usare l'indirizzo email del tuo account"
|
||||
|
||||
#: mailstream.php:371
|
||||
msgid "Exclude Likes"
|
||||
msgstr "Escludi \"Mi Piace\""
|
||||
|
||||
#: mailstream.php:373
|
||||
msgid "Check this to omit mailing \"Like\" notifications"
|
||||
msgstr "Seleziona per evitare di inviare notifiche per \"Mi Piace\""
|
||||
|
||||
#: mailstream.php:376
|
||||
msgid "Attach Images"
|
||||
msgstr "Allega Immagini"
|
||||
|
||||
#: mailstream.php:378
|
||||
msgid ""
|
||||
"Download images in posts and attach them to the email. Useful for reading "
|
||||
"email while offline."
|
||||
msgstr "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline."
|
||||
|
||||
#: mailstream.php:379
|
||||
msgid "Mail Stream Settings"
|
||||
msgstr "Impostazioni Mail Stream"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ $a->strings["Email"] = "Email";
|
|||
$a->strings["Friendica Item"] = "Elemento da Friendica";
|
||||
$a->strings["Upstream"] = "Upstream";
|
||||
$a->strings["Local"] = "Locale";
|
||||
$a->strings["Enabled"] = "Abilitato";
|
||||
$a->strings["Email Address"] = "Indirizzo Email";
|
||||
$a->strings["Leave blank to use your account email address"] = "Lascia in bianco per usare l'indirizzo email del tuo account";
|
||||
$a->strings["Enabled"] = "Abilitato";
|
||||
$a->strings["Exclude Likes"] = "Escludi \"Mi Piace\"";
|
||||
$a->strings["Check this to omit mailing \"Like\" notifications"] = "Seleziona per evitare di inviare notifiche per \"Mi Piace\"";
|
||||
$a->strings["Attach Images"] = "Allega Immagini";
|
||||
$a->strings["Download images in posts and attach them to the email. Useful for reading email while offline."] = "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline.";
|
||||
$a->strings["Mail Stream Settings"] = "Impostazioni Mail Stream";
|
||||
|
|
|
|||
|
|
@ -6,12 +6,20 @@
|
|||
* 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\DBM;
|
||||
use Friendica\Util\Network;
|
||||
|
||||
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') {
|
||||
q('ALTER TABLE `mailstream_item` DROP INDEX `uid`');
|
||||
|
|
@ -48,33 +56,33 @@ function mailstream_install() {
|
|||
}
|
||||
|
||||
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']);
|
||||
}
|
||||
|
|
@ -149,8 +157,8 @@ function mailstream_do_images($a, &$item, &$attachments) {
|
|||
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());
|
||||
|
|
@ -174,7 +182,7 @@ function mailstream_sender($item) {
|
|||
}
|
||||
|
||||
function mailstream_decode_subject($subject) {
|
||||
$html = bbcode($subject);
|
||||
$html = BBCode::convert($subject);
|
||||
if (!$html) {
|
||||
return $subject;
|
||||
}
|
||||
|
|
@ -212,7 +220,7 @@ function mailstream_subject($item) {
|
|||
break;
|
||||
}
|
||||
if ($r[0]['title']) {
|
||||
return t('Re:') . ' ' . mailstream_decode_subject($r[0]['title']);
|
||||
return L10n::t('Re:') . ' ' . mailstream_decode_subject($r[0]['title']);
|
||||
}
|
||||
$parent = $r[0]['thr-parent'];
|
||||
}
|
||||
|
|
@ -220,10 +228,10 @@ function mailstream_subject($item) {
|
|||
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']);
|
||||
|
|
@ -233,12 +241,12 @@ function mailstream_subject($item) {
|
|||
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) {
|
||||
|
|
@ -249,8 +257,8 @@ 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');
|
||||
if ($frommail == "") {
|
||||
|
|
@ -262,7 +270,7 @@ function mailstream_send($a, $message_id, $item, $user) {
|
|||
}
|
||||
$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;
|
||||
|
|
@ -279,12 +287,12 @@ function mailstream_send($a, $message_id, $item, $user) {
|
|||
$mail->IsHTML(true);
|
||||
$mail->CharSet = 'utf-8';
|
||||
$template = get_markup_template('mail.tpl', 'addon/mailstream/');
|
||||
$item['body'] = bbcode($item['body']);
|
||||
$item['body'] = BBCode::convert($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));
|
||||
$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);
|
||||
|
|
@ -342,37 +350,37 @@ function mailstream_cron($a, $b) {
|
|||
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(
|
||||
'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']);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ class PHPMailer
|
|||
public $UseSendmailOptions = true;
|
||||
|
||||
/**
|
||||
* Path to PHPMailer plugins.
|
||||
* Path to PHPMailer addons.
|
||||
* Useful if the SMTP class is not in the PHP include path.
|
||||
* @var string
|
||||
* @deprecated Should not be needed now there is an autoloader.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
<div class="settings-block">
|
||||
<h3>{{$title}}</h3>
|
||||
<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
|
||||
<h3>{{$title}}</h3>
|
||||
</span>
|
||||
<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
|
||||
<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
|
||||
<h3>{{$title}}</h3>
|
||||
</span>
|
||||
{{include file="field_checkbox.tpl" field=$enabled}}
|
||||
{{include file="field_input.tpl" field=$address}}
|
||||
{{include file="field_checkbox.tpl" field=$nolikes}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue