Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -1,5 +1,4 @@
<?php
/**
* Name: Insanejournal Post Connector
* Description: Post to Insanejournal
@ -9,20 +8,27 @@
* Author: Cat Gray <https://free-haven.org/profile/catness>
*/
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
function ijpost_install() {
register_hook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
register_hook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
register_hook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
register_hook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
register_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
function ijpost_uninstall() {
unregister_hook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
unregister_hook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
unregister_hook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
unregister_hook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
unregister_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local');
Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send');
Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings');
Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
}
@ -36,7 +42,7 @@ function ijpost_jot_nets(&$a,&$b) {
$ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default');
$selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
. t('Post to Insanejournal') . '</div>';
. L10n::t('Post to Insanejournal') . '</div>';
}
}
@ -66,36 +72,36 @@ function ijpost_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. t("InsaneJournal Export").'</h3>';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
$s .= '</span>';
$s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. t("InsaneJournal Export").'</h3>';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
$s .= '</span>';
$s .= '<div id="ijpost-enable-wrapper">';
$s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . t('Enable InsaneJournal Post Plugin') . '</label>';
$s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . L10n::t('Enable InsaneJournal Post Addon') . '</label>';
$s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-username-wrapper">';
$s .= '<label id="ijpost-username-label" for="ijpost-username">' . t('InsaneJournal username') . '</label>';
$s .= '<label id="ijpost-username-label" for="ijpost-username">' . L10n::t('InsaneJournal username') . '</label>';
$s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-password-wrapper">';
$s .= '<label id="ijpost-password-label" for="ijpost-password">' . t('InsaneJournal password') . '</label>';
$s .= '<label id="ijpost-password-label" for="ijpost-password">' . L10n::t('InsaneJournal password') . '</label>';
$s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-bydefault-wrapper">';
$s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . t('Post to InsaneJournal by default') . '</label>';
$s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . L10n::t('Post to InsaneJournal by default') . '</label>';
$s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
@ -172,16 +178,12 @@ function ijpost_send(&$a,&$b) {
$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
if($ij_username && $ij_password && $ij_blog) {
require_once('include/bbcode.php');
require_once('include/datetime.php');
$title = $b['title'];
$post = bbcode($b['body']);
$post = BBCode::convert($b['body']);
$post = xmlify($post);
$tags = ijpost_get_tags($b['tag']);
$date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
$date = DateTimeFormat::convert($b['created'], $tz);
$year = intval(substr($date,0,4));
$mon = intval(substr($date,5,2));
$day = intval(substr($date,8,2));
@ -217,8 +219,9 @@ EOT;
logger('ijpost: data: ' . $xml, LOGGER_DATA);
if($ij_blog !== 'test')
$x = post_url($ij_blog,$xml,array("Content-Type: text/xml"));
if($ij_blog !== 'test') {
$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]);
}
logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
}

View file

@ -26,7 +26,7 @@ msgid "InsaneJournal Post Settings"
msgstr ""
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgid "Enable InsaneJournal Post Addon"
msgstr ""
#: ijpost.php:77

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "Enviament a Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Ajustos d'Enviament a Insanejournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Habilita el Plugin d'Enviaments a Insanejournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Habilita el Addon d'Enviaments a Insanejournal";
$a->strings["InsaneJournal username"] = "Nom d'usuari de Insanejournal";
$a->strings["InsaneJournal password"] = "Contrasenya de Insanejournal";
$a->strings["Post to InsaneJournal by default"] = "Enviar per defecte a Insanejournal";

View file

@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings"
msgstr "Nastavení příspěvků pro InsaneJournal"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgstr "Povolit Insanejournal plugin"
msgid "Enable InsaneJournal Post Addon"
msgstr "Povolit Insanejournal addon"
#: ijpost.php:77
msgid "InsaneJournal username"

View file

@ -7,7 +7,7 @@ function string_plural_select_cs($n){
;
$a->strings["Post to Insanejournal"] = "Odeslat na Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Nastavení příspěvků pro InsaneJournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin";
$a->strings["Enable InsaneJournal Post Addon"] = "Povolit Insanejournal addon";
$a->strings["InsaneJournal username"] = "Insanejournal uživatelské jméno";
$a->strings["InsaneJournal password"] = "Insanejournal heslo";
$a->strings["Post to InsaneJournal by default"] = "Defaultně zasílat příspěvky na InsaneJournal";

View file

@ -29,8 +29,8 @@ msgid "InsaneJournal Post Settings"
msgstr "InsaneJournal Beitrags-Einstellungen"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgstr "InsaneJournal Plugin aktivieren"
msgid "Enable InsaneJournal Post Addon"
msgstr "InsaneJournal Addon aktivieren"
#: ijpost.php:77
msgid "InsaneJournal username"

View file

@ -7,7 +7,7 @@ function string_plural_select_de($n){
;
$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen";
$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren";
$a->strings["Enable InsaneJournal Post Addon"] = "InsaneJournal Addon aktivieren";
$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "Afiŝi al Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afiŝoj";
$a->strings["Enable InsaneJournal Post Plugin"] = "Ŝalti la InsaneJournal afiŝo kromprogramon.";
$a->strings["Enable InsaneJournal Post Addon"] = "Ŝalti la InsaneJournal afiŝo kromprogramon.";
$a->strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal";
$a->strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal";
$a->strings["Post to InsaneJournal by default"] = "Defaŭlte afiŝi ĉe InsaneJournal";

View file

@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings"
msgstr "Ajustes de Entrada de InsaneJournal"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgstr "Habilitar el Plugin de Entrada InsaneJournal"
msgid "Enable InsaneJournal Post Addon"
msgstr "Habilitar el Addon de Entrada InsaneJournal"
#: ijpost.php:77
msgid "InsaneJournal username"

View file

@ -7,7 +7,7 @@ function string_plural_select_es($n){
;
$a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Ajustes de Entrada de InsaneJournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar el Plugin de Entrada InsaneJournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar el Addon de Entrada InsaneJournal";
$a->strings["InsaneJournal username"] = "Nombre de usuario InsaneJournal";
$a->strings["InsaneJournal password"] = "Contraseña de InsaneJournal";
$a->strings["Post to InsaneJournal by default"] = "Publicar en InsaneJournal por defecto";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "Publier vers InsaneJournal";
$a->strings["InsaneJournal Post Settings"] = "Réglages InsaneJournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Activer le connecteur InsaneJournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Activer le connecteur InsaneJournal";
$a->strings["InsaneJournal username"] = "Utilisateur InsaneJournal";
$a->strings["InsaneJournal password"] = "Mot de passe InsaneJournal";
$a->strings["Post to InsaneJournal by default"] = "Publier sur InsaneJournal par défaut";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "";
$a->strings["InsaneJournal Post Settings"] = "";
$a->strings["Enable InsaneJournal Post Plugin"] = "";
$a->strings["Enable InsaneJournal Post Addon"] = "";
$a->strings["InsaneJournal username"] = "";
$a->strings["InsaneJournal password"] = "";
$a->strings["Post to InsaneJournal by default"] = "";

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2015-08-31 10:15+0000\n"
"PO-Revision-Date: 2018-03-19 13:22+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"
@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings"
msgstr "Impostazioni post InsaneJournal"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgstr "Abilita il plugin di invio a InsaneJournal"
msgid "Enable InsaneJournal Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a InsaneJournal"
#: ijpost.php:77
msgid "InsaneJournal username"

View file

@ -7,7 +7,7 @@ function string_plural_select_it($n){
;
$a->strings["Post to Insanejournal"] = "Invia a InsaneJournal";
$a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin di invio a InsaneJournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a InsaneJournal";
$a->strings["InsaneJournal username"] = "Nome utente InsaneJournal";
$a->strings["InsaneJournal password"] = "Password InsaneJournal";
$a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "";
$a->strings["InsaneJournal Post Settings"] = "";
$a->strings["Enable InsaneJournal Post Plugin"] = "";
$a->strings["Enable InsaneJournal Post Addon"] = "";
$a->strings["InsaneJournal username"] = "";
$a->strings["InsaneJournal password"] = "";
$a->strings["Post to InsaneJournal by default"] = "";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "Opublikuj na Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "";
$a->strings["Enable InsaneJournal Post Plugin"] = "";
$a->strings["Enable InsaneJournal Post Addon"] = "";
$a->strings["InsaneJournal username"] = "";
$a->strings["InsaneJournal password"] = "";
$a->strings["Post to InsaneJournal by default"] = "";

View file

@ -28,7 +28,7 @@ msgid "InsaneJournal Post Settings"
msgstr "Configurações de publicação no InsaneJournal"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgid "Enable InsaneJournal Post Addon"
msgstr "Habilitar plug-in para publicar no InsaneJournal"
#: ijpost.php:77

View file

@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){
;
$a->strings["Post to Insanejournal"] = "Publicar no Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Configurações de publicação no InsaneJournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar plug-in para publicar no InsaneJournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar plug-in para publicar no InsaneJournal";
$a->strings["InsaneJournal username"] = "Nome de usuário no InsaneJournal";
$a->strings["InsaneJournal password"] = "Senha do InsaneJournal";
$a->strings["Post to InsaneJournal by default"] = "Publicar no InsaneJournal por padrão";

View file

@ -28,7 +28,7 @@ msgid "InsaneJournal Post Settings"
msgstr "Configurări Postări Insaneournal"
#: ijpost.php:72
msgid "Enable InsaneJournal Post Plugin"
msgid "Enable InsaneJournal Post Addon"
msgstr "Activare Modul Postare InsaneJournal"
#: ijpost.php:77

View file

@ -7,7 +7,7 @@ function string_plural_select_ro($n){
;
$a->strings["Post to Insanejournal"] = "Postare pe Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Configurări Postări Insaneournal";
$a->strings["Enable InsaneJournal Post Plugin"] = "Activare Modul Postare InsaneJournal";
$a->strings["Enable InsaneJournal Post Addon"] = "Activare Modul Postare InsaneJournal";
$a->strings["InsaneJournal username"] = "Utilizator InsaneJournal ";
$a->strings["InsaneJournal password"] = "Parolă InsaneJournal ";
$a->strings["Post to InsaneJournal by default"] = "Postați implicit pe InsaneJournal ";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "";
$a->strings["InsaneJournal Post Settings"] = "";
$a->strings["Enable InsaneJournal Post Plugin"] = "Включить InsaneJournal плагин сообщений";
$a->strings["Enable InsaneJournal Post Addon"] = "Включить InsaneJournal плагин сообщений";
$a->strings["InsaneJournal username"] = "";
$a->strings["InsaneJournal password"] = "";
$a->strings["Post to InsaneJournal by default"] = "";

View file

@ -2,7 +2,7 @@
$a->strings["Post to Insanejournal"] = "转播到Insanejournal";
$a->strings["InsaneJournal Post Settings"] = "Insanejournal转播设置";
$a->strings["Enable InsaneJournal Post Plugin"] = "使InsaneJournal转播插件可用";
$a->strings["Enable InsaneJournal Post Addon"] = "使InsaneJournal转播插件可用";
$a->strings["InsaneJournal username"] = "InsaneJournal用户名";
$a->strings["InsaneJournal password"] = "InsaneJournal密码";
$a->strings["Post to InsaneJournal by default"] = "默认地转播到InsaneJournal";