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

@ -55,7 +55,7 @@ Integration into other frameworks
`django-conversejs <https://pypi.python.org/pypi/django-conversejs>`_ is an app that makes it easer to integrate *Converse.js* into Django.
`django-xmpp <https://github.com/fpytloun/django-xmpp>`_ adds XMPP chat integration with converse.js by letting Ejabberd authenticate against your Django site.
* `Roundcube <http://roundcube.net>`_:
`roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is a plugin for Roundcube Webmail.
`roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is an addon for Roundcube Webmail.
* `Wordpress <http://wordpress.org>`_:
`ConverseJS <http://wordpress.org/plugins/conversejs>`_
* `Patternslib <http://patternslib.com>`_:

File diff suppressed because one or more lines are too long

61
xmpp/lang/it/messages.po Normal file
View file

@ -0,0 +1,61 @@
# ADDON xmpp
# Copyright (C)
# This file is distributed under the same license as the Friendica xmpp addon package.
#
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-27 09:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: xmpp.php:38
msgid "XMPP settings updated."
msgstr "Impostazioni XMPP aggiornate."
#: xmpp.php:63 xmpp.php:67
msgid "XMPP-Chat (Jabber)"
msgstr "XMPP-Chat (Jabber)"
#: xmpp.php:71
msgid "Enable Webchat"
msgstr "Abilita chat web"
#: xmpp.php:76
msgid "Individual Credentials"
msgstr "Credenziali Individuali"
#: xmpp.php:82 xmpp.php:108
msgid "Jabber BOSH host"
msgstr "Server Jabber BOSH"
#: xmpp.php:91 xmpp.php:107
msgid "Save Settings"
msgstr "Salva Impostazioni"
#: xmpp.php:109
msgid "Use central userbase"
msgstr "Usa base utenti centrale"
#: xmpp.php:109
msgid ""
"If enabled, users will automatically login to an ejabberd server that has to"
" be installed on this machine with synchronized credentials via the "
"\"auth_ejabberd.php\" script."
msgstr ""
"Se abilitato, gli utenti verranno automaticamente autenticati con un server "
"ejabber che deve essere installato su questa macchina, con le credenziali "
"sincronizzate attraverso lo script \"auth_ejabberd.php\""
#: xmpp.php:119
msgid "Settings updated."
msgstr "Impostazioni aggiornate."

16
xmpp/lang/it/strings.php Normal file
View file

@ -0,0 +1,16 @@
<?php
if(! function_exists("string_plural_select_it")) {
function string_plural_select_it($n){
return ($n != 1);;
}}
;
$a->strings["XMPP settings updated."] = "Impostazioni XMPP aggiornate.";
$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
$a->strings["Enable Webchat"] = "Abilita chat web";
$a->strings["Individual Credentials"] = "Credenziali Individuali";
$a->strings["Jabber BOSH host"] = "Server Jabber BOSH";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Use central userbase"] = "Usa base utenti centrale";
$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Se abilitato, gli utenti verranno automaticamente autenticati con un server ejabber che deve essere installato su questa macchina, con le credenziali sincronizzate attraverso lo script \"auth_ejabberd.php\"";
$a->strings["Settings updated."] = "Impostazioni aggiornate.";

61
xmpp/lang/nl/messages.po Normal file
View file

@ -0,0 +1,61 @@
# ADDON xmpp
# Copyright (C)
# This file is distributed under the same license as the Friendica xmpp addon package.
#
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-27 09:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Karel Vandecandelaere <karel@dasrakel.eu>, 2018\n"
"Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: xmpp.php:38
msgid "XMPP settings updated."
msgstr "XMPP-instellingen bijgewerkt."
#: xmpp.php:63 xmpp.php:67
msgid "XMPP-Chat (Jabber)"
msgstr "XMPP-chat (Jabber)"
#: xmpp.php:71
msgid "Enable Webchat"
msgstr "Webchat inschakelen"
#: xmpp.php:76
msgid "Individual Credentials"
msgstr ""
#: xmpp.php:82 xmpp.php:108
msgid "Jabber BOSH host"
msgstr "Jabber BOSH Server"
#: xmpp.php:91 xmpp.php:107
msgid "Save Settings"
msgstr "Instellingen opslaan"
#: xmpp.php:109
msgid "Use central userbase"
msgstr ""
#: xmpp.php:109
msgid ""
"If enabled, users will automatically login to an ejabberd server that has to"
" be installed on this machine with synchronized credentials via the "
"\"auth_ejabberd.php\" script."
msgstr ""
"Wanneer ingeschakeld zullen gebruikers automatisch inloggen op een ejabberd-"
"server die op deze server moet geïnstalleerd staan, met dezelfde "
"gebruikersnaam en wachtwoord, via het \"auth_ejabberd.php\" script."
#: xmpp.php:119
msgid "Settings updated."
msgstr "Instellingen bijgewerkt."

16
xmpp/lang/nl/strings.php Normal file
View file

@ -0,0 +1,16 @@
<?php
if(! function_exists("string_plural_select_nl")) {
function string_plural_select_nl($n){
return ($n != 1);;
}}
;
$a->strings["XMPP settings updated."] = "XMPP-instellingen bijgewerkt.";
$a->strings["XMPP-Chat (Jabber)"] = "XMPP-chat (Jabber)";
$a->strings["Enable Webchat"] = "Webchat inschakelen";
$a->strings["Individual Credentials"] = "";
$a->strings["Jabber BOSH host"] = "Jabber BOSH Server";
$a->strings["Save Settings"] = "Instellingen opslaan";
$a->strings["Use central userbase"] = "";
$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wanneer ingeschakeld zullen gebruikers automatisch inloggen op een ejabberd-server die op deze server moet geïnstalleerd staan, met dezelfde gebruikersnaam en wachtwoord, via het \"auth_ejabberd.php\" script.";
$a->strings["Settings updated."] = "Instellingen bijgewerkt.";

View file

@ -5,34 +5,42 @@
* Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function xmpp_install() {
register_hook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
register_hook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
register_hook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
register_hook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
function xmpp_install()
{
Addon::registerHook('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
Addon::registerHook('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
Addon::registerHook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
Addon::registerHook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
}
function xmpp_uninstall() {
unregister_hook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
unregister_hook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
unregister_hook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
unregister_hook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
function xmpp_uninstall()
{
Addon::unregisterHook('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
Addon::unregisterHook('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
Addon::unregisterHook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
Addon::unregisterHook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
}
function xmpp_plugin_settings_post($a,$post) {
if(! local_user() || (! x($_POST,'xmpp-settings-submit')))
function xmpp_addon_settings_post()
{
if (!local_user() || (!x($_POST, 'xmpp-settings-submit'))) {
return;
set_pconfig(local_user(),'xmpp','enabled',intval($_POST['xmpp_enabled']));
set_pconfig(local_user(),'xmpp','individual',intval($_POST['xmpp_individual']));
set_pconfig(local_user(),'xmpp','bosh_proxy',$_POST['xmpp_bosh_proxy']);
info( t('XMPP settings updated.') . EOL);
info(L10n::t('XMPP settings updated.') . EOL);
}
function xmpp_plugin_settings(&$a,&$s) {
if(! local_user())
function xmpp_addon_settings(App $a, &$s)
{
if (!local_user()) {
return;
/* Add our stylesheet to the xmpp so we can make our settings look nice */
@ -51,27 +59,27 @@ function xmpp_plugin_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<span id="settings_xmpp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
$s .= '<h3>' . t('XMPP-Chat (Jabber)') . '</h3>';
$s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_xmpp_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
$s .= '<h3>' . t('XMPP-Chat (Jabber)') . '</h3>';
$s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
$s .= '</span>';
$s .= '<div id="xmpp-settings-wrapper">';
$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . t('Enable Webchat') . '</label>';
$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . L10n::t('Enable Webchat') . '</label>';
$s .= '<input id="xmpp-enabled" type="checkbox" name="xmpp_enabled" value="1" ' . $enabled_checked . '/>';
$s .= '<div class="clear"></div>';
if (get_config("xmpp", "central_userbase")) {
$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . t('Individual Credentials') . '</label>';
if (Config::get("xmpp", "central_userbase")) {
$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . L10n::t('Individual Credentials') . '</label>';
$s .= '<input id="xmpp-individual" type="checkbox" name="xmpp_individual" value="1" ' . $individual_checked . '/>';
$s .= '<div class="clear"></div>';
}
if (!get_config("xmpp", "central_userbase") || get_pconfig(local_user(),"xmpp","individual")) {
$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">'.t('Jabber BOSH host').'</label>';
$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="'.$bosh_proxy.'" />';
if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . L10n::t('Jabber BOSH host') . '</label>';
$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="' . $bosh_proxy . '" />';
$s .= '<div class="clear"></div>';
}
@ -79,8 +87,7 @@ function xmpp_plugin_settings(&$a,&$s) {
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
function xmpp_login($a,$b) {
@ -90,22 +97,24 @@ function xmpp_login($a,$b) {
}
}
function xmpp_plugin_admin(&$a, &$o){
function xmpp_addon_admin(App $a, &$o)
{
$t = get_markup_template("admin.tpl", "addon/xmpp/");
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
'$bosh_proxy' => array('bosh_proxy', t('Jabber BOSH host'), get_config('xmpp', 'bosh_proxy'), ''),
'$central_userbase' => array('central_userbase', t('Use central userbase'), get_config('xmpp', 'central_userbase'), t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')),
));
$o = replace_macros($t, [
'$submit' => L10n::t('Save Settings'),
'$bosh_proxy' => ['bosh_proxy', L10n::t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
'$central_userbase' => ['central_userbase', L10n::t('Use central userbase'), Config::get('xmpp', 'central_userbase'), L10n::t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')],
]);
}
function xmpp_plugin_admin_post(&$a){
$bosh_proxy = ((x($_POST,'bosh_proxy')) ? trim($_POST['bosh_proxy']) : '');
$central_userbase = ((x($_POST,'central_userbase')) ? intval($_POST['central_userbase']) : false);
set_config('xmpp','bosh_proxy',$bosh_proxy);
set_config('xmpp','central_userbase',$central_userbase);
info( t('Settings updated.'). EOL );
function xmpp_addon_admin_post()
{
$bosh_proxy = ((x($_POST, 'bosh_proxy')) ? trim($_POST['bosh_proxy']) : '');
$central_userbase = ((x($_POST, 'central_userbase')) ? intval($_POST['central_userbase']) : false);
Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
Config::set('xmpp', 'central_userbase', $central_userbase);
info(L10n::t('Settings updated.') . EOL);
}
function xmpp_script(&$a,&$s) {