Revert to stable version 3.5.4

This commit is contained in:
Hypolite Petovan 2018-02-11 19:00:01 -05:00
parent 38db18b624
commit 5360f08f42
355 changed files with 21449 additions and 4957 deletions

View file

@ -1,57 +0,0 @@
# 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: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: xmpp.php:38
msgid "XMPP settings updated."
msgstr ""
#: xmpp.php:63 xmpp.php:67
msgid "XMPP-Chat (Jabber)"
msgstr ""
#: xmpp.php:71
msgid "Enable Webchat"
msgstr ""
#: xmpp.php:76
msgid "Individual Credentials"
msgstr ""
#: xmpp.php:82 xmpp.php:108
msgid "Jabber BOSH host"
msgstr ""
#: xmpp.php:91 xmpp.php:107
msgid "Save Settings"
msgstr ""
#: 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 ""
#: xmpp.php:119
msgid "Settings updated."
msgstr ""

View file

@ -1,61 +0,0 @@
# 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: Andreas H. <webmaster@a-zwenkau.de>, 2017\n"
"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/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"
#: xmpp.php:38
msgid "XMPP settings updated."
msgstr "XMPP Einstellungen aktualisiert."
#: xmpp.php:63 xmpp.php:67
msgid "XMPP-Chat (Jabber)"
msgstr "XMPP-Chat (Jabber)"
#: xmpp.php:71
msgid "Enable Webchat"
msgstr "Aktiviere Webchat"
#: xmpp.php:76
msgid "Individual Credentials"
msgstr "Individuelle Anmeldedaten"
#: xmpp.php:82 xmpp.php:108
msgid "Jabber BOSH host"
msgstr "Jabber BOSH Host"
#: xmpp.php:91 xmpp.php:107
msgid "Save Settings"
msgstr "Speichere Einstellungen"
#: xmpp.php:109
msgid "Use central userbase"
msgstr "Nutze zentrale Nutzerbasis"
#: 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 ""
"Wenn aktiviert, werden die Nutzer automatisch auf dem EJabber Server, der "
"auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden "
"über das \"auth_ejabberd.php\"-Script synchronisiert."
#: xmpp.php:119
msgid "Settings updated."
msgstr "Einstellungen aktualisiert."

View file

@ -1,16 +0,0 @@
<?php
if(! function_exists("string_plural_select_de")) {
function string_plural_select_de($n){
return ($n != 1);;
}}
;
$a->strings["XMPP settings updated."] = "XMPP Einstellungen aktualisiert.";
$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
$a->strings["Enable Webchat"] = "Aktiviere Webchat";
$a->strings["Individual Credentials"] = "Individuelle Anmeldedaten";
$a->strings["Jabber BOSH host"] = "Jabber BOSH Host";
$a->strings["Save Settings"] = "Speichere Einstellungen";
$a->strings["Use central userbase"] = "Nutze zentrale Nutzerbasis";
$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."] = "Wenn aktiviert, werden die Nutzer automatisch auf dem EJabber Server, der auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden über das \"auth_ejabberd.php\"-Script synchronisiert.";
$a->strings["Settings updated."] = "Einstellungen aktualisiert.";

View file

@ -1,48 +1,39 @@
<?php
/**
* Name: XMPP (Jabber)
* Description: Embedded XMPP (Jabber) client
* Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
function xmpp_install()
{
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_uninstall()
{
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_plugin_settings_post()
{
if (!local_user() || (!x($_POST, 'xmpp-settings-submit'))) {
function xmpp_plugin_settings_post($a,$post) {
if(! local_user() || (! x($_POST,'xmpp-settings-submit')))
return;
}
PConfig::set(local_user(), 'xmpp', 'enabled', intval($_POST['xmpp_enabled']));
PConfig::set(local_user(), 'xmpp', 'individual', intval($_POST['xmpp_individual']));
PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy']);
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( t('XMPP settings updated.') . EOL);
}
function xmpp_plugin_settings(App $a, &$s)
{
if (!local_user()) {
function xmpp_plugin_settings(&$a,&$s) {
if(! local_user())
return;
}
/* Add our stylesheet to the xmpp so we can make our settings look nice */
@ -50,13 +41,13 @@ function xmpp_plugin_settings(App $a, &$s)
/* Get the current state of our config variable */
$enabled = intval(PConfig::get(local_user(), 'xmpp', 'enabled'));
$enabled = intval(get_pconfig(local_user(),'xmpp','enabled'));
$enabled_checked = (($enabled) ? ' checked="checked" ' : '');
$individual = intval(PConfig::get(local_user(), 'xmpp', 'individual'));
$individual = intval(get_pconfig(local_user(),'xmpp','individual'));
$individual_checked = (($individual) ? ' checked="checked" ' : '');
$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
$bosh_proxy = get_pconfig(local_user(),"xmpp","bosh_proxy");
/* 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\');">';
@ -72,15 +63,15 @@ function xmpp_plugin_settings(App $a, &$s)
$s .= '<input id="xmpp-enabled" type="checkbox" name="xmpp_enabled" value="1" ' . $enabled_checked . '/>';
$s .= '<div class="clear"></div>';
if (Config::get("xmpp", "central_userbase")) {
if (get_config("xmpp", "central_userbase")) {
$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . t('Individual Credentials') . '</label>';
$s .= '<input id="xmpp-individual" type="checkbox" name="xmpp_individual" value="1" ' . $individual_checked . '/>';
$s .= '<div class="clear"></div>';
}
if (!Config::get("xmpp", "central_userbase") || PConfig::get(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 (!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.'" />';
$s .= '<div class="clear"></div>';
}
@ -89,77 +80,68 @@ function xmpp_plugin_settings(App $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>';
}
function xmpp_login()
{
function xmpp_login($a,$b) {
if (!$_SESSION["allow_api"]) {
$password = random_string(16);
PConfig::set(local_user(), "xmpp", "password", $password);
$password = substr(random_string(),0,16);
set_pconfig(local_user(), "xmpp", "password", $password);
}
}
function xmpp_plugin_admin(App $a, &$o)
{
function xmpp_plugin_admin(&$a, &$o){
$t = get_markup_template("admin.tpl", "addon/xmpp/");
$o = replace_macros($t, [
$o = replace_macros($t, array(
'$submit' => t('Save Settings'),
'$bosh_proxy' => ['bosh_proxy', t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
'$central_userbase' => ['central_userbase', t('Use central userbase'), Config::get('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.')],
]);
'$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.')),
));
}
function xmpp_plugin_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(t('Settings updated.') . EOL);
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_script(App $a)
{
xmpp_converse($a);
function xmpp_script(&$a,&$s) {
xmpp_converse($a,$s);
}
function xmpp_converse(App $a)
{
if (!local_user()) {
function xmpp_converse(&$a,&$s) {
if (!local_user())
return;
}
if ($_GET["mode"] == "minimal") {
if ($_GET["mode"] == "minimal")
return;
}
if ($a->is_mobile || $a->is_tablet) {
if ($a->is_mobile || $a->is_tablet)
return;
}
if (!PConfig::get(local_user(), "xmpp", "enabled")) {
if (!get_pconfig(local_user(),"xmpp","enabled"))
return;
}
if (in_array($a->query_string, ["admin/federation/"])) {
if (in_array($a->query_string, array("admin/federation/")))
return;
}
$a->page['htmlhead'] .= '<link type="text/css" rel="stylesheet" media="screen" href="addon/xmpp/converse/css/converse.css" />' . "\n";
$a->page['htmlhead'] .= '<script src="addon/xmpp/converse/builds/converse.min.js"></script>' . "\n";
$a->page['htmlhead'] .= '<link type="text/css" rel="stylesheet" media="screen" href="addon/xmpp/converse/css/converse.css" />'."\n";
$a->page['htmlhead'] .= '<script src="addon/xmpp/converse/builds/converse.min.js"></script>'."\n";
if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) {
$bosh_proxy = Config::get("xmpp", "bosh_proxy");
if (get_config("xmpp", "central_userbase") && !get_pconfig(local_user(),"xmpp","individual")) {
$bosh_proxy = get_config("xmpp", "bosh_proxy");
$password = PConfig::get(local_user(), "xmpp", "password", '', true);
$password = get_pconfig(local_user(), "xmpp", "password");
if ($password == "") {
$password = random_string(16);
PConfig::set(local_user(), "xmpp", "password", $password);
$password = substr(random_string(),0,16);
set_pconfig(local_user(), "xmpp", "password", $password);
}
$jid = $a->user["nickname"] . "@" . $a->get_hostname() . "/converse-" . random_string(5);
$jid = $a->user["nickname"]."@".$a->get_hostname()."/converse-".substr(random_string(),0,5);;
$auto_login = "auto_login: true,
authentication: 'login',
@ -167,20 +149,18 @@ function xmpp_converse(App $a)
password: '$password',
allow_logout: false,";
} else {
$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
$bosh_proxy = get_pconfig(local_user(), "xmpp", "bosh_proxy");
$auto_login = "";
}
if ($bosh_proxy == "") {
if ($bosh_proxy == "")
return;
}
if (in_array($a->argv[0], ["manage", "logout"])) {
if (in_array($a->argv[0], array("manage", "logout")))
$additional_commands = "converse.user.logout();\n";
} else {
else
$additional_commands = "";
}
$on_ready = "";
@ -217,3 +197,4 @@ function xmpp_converse(App $a)
});
</script>";
}
?>