X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmpp%2Fxmpp.php;h=33da9715554de63a0c0b039aa831c01411dafc88;hb=b11e418f3570a5a61bab3fb3bc2660b92635b108;hp=2548005ee7564042bc472b429fa764cdfaef52cb;hpb=c71f7b0e1a7bb5ca88347b295dd3a4cc3106c5a9;p=friendica-addons.git
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 2548005e..33da9715 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -1,42 +1,45 @@
+ * Status: Unsupported
*/
+
use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Util\Strings;
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');
+ Hook::register('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+ Hook::register('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+ Hook::register('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+ Hook::register('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');
+ Hook::unregister('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+ Hook::unregister('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+ Hook::unregister('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+ Hook::unregister('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
}
function xmpp_addon_settings_post()
{
- if (!local_user() || (!x($_POST, 'xmpp-settings-submit'))) {
+ if (!local_user() || empty($_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']);
- info(t('XMPP settings updated.') . EOL);
+ DI::pConfig()->set(local_user(), 'xmpp', 'enabled', $_POST['xmpp_enabled'] ?? false);
+ DI::pConfig()->set(local_user(), 'xmpp', 'individual', $_POST['xmpp_individual'] ?? false);
+ DI::pConfig()->set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy'] ?? '');
+
+ info(DI::l10n()->t('XMPP settings updated.') . EOL);
}
function xmpp_addon_settings(App $a, &$s)
@@ -47,40 +50,40 @@ function xmpp_addon_settings(App $a, &$s)
/* Add our stylesheet to the xmpp so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variable */
- $enabled = intval(PConfig::get(local_user(), 'xmpp', 'enabled'));
+ $enabled = intval(DI::pConfig()->get(local_user(), 'xmpp', 'enabled'));
$enabled_checked = (($enabled) ? ' checked="checked" ' : '');
- $individual = intval(PConfig::get(local_user(), 'xmpp', 'individual'));
+ $individual = intval(DI::pConfig()->get(local_user(), 'xmpp', 'individual'));
$individual_checked = (($individual) ? ' checked="checked" ' : '');
- $bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
+ $bosh_proxy = DI::pConfig()->get(local_user(), "xmpp", "bosh_proxy");
/* Add some HTML to the existing form */
$s .= '';
- $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '' . DI::l10n()->t('XMPP-Chat (Jabber)') . '
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '' . DI::l10n()->t('XMPP-Chat (Jabber)') . '
';
$s .= '';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- if (Config::get("xmpp", "central_userbase")) {
- $s .= '
';
+ if (DI::config()->get("xmpp", "central_userbase")) {
+ $s .= '
';
$s .= '
';
$s .= '
';
}
- if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
- $s .= '
';
+ if (!DI::config()->get("xmpp", "central_userbase") || DI::pConfig()->get(local_user(), "xmpp", "individual")) {
+ $s .= '
';
$s .= '
';
$s .= '
';
}
@@ -89,35 +92,37 @@ function xmpp_addon_settings(App $a, &$s)
/* provide a submit button */
- $s .= '
';
+ $s .= '
';
}
function xmpp_login()
{
- if (!$_SESSION["allow_api"]) {
- $password = random_string(16);
- PConfig::set(local_user(), "xmpp", "password", $password);
+ if (empty($_SESSION['allow_api'])) {
+ $password = Strings::getRandomHex(16);
+ DI::pConfig()->set(local_user(), 'xmpp', 'password', $password);
}
}
function xmpp_addon_admin(App $a, &$o)
{
- $t = get_markup_template("admin.tpl", "addon/xmpp/");
+ $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/xmpp/');
- $o = replace_macros($t, [
- '$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.')],
+ $o = Renderer::replaceMacros($t, [
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$bosh_proxy' => ['bosh_proxy', DI::l10n()->t('Jabber BOSH host'), DI::config()->get('xmpp', 'bosh_proxy'), ''],
+ '$central_userbase' => ['central_userbase', DI::l10n()->t('Use central userbase'), DI::config()->get('xmpp', 'central_userbase'), DI::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_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(t('Settings updated.') . EOL);
+ $bosh_proxy = (!empty($_POST['bosh_proxy']) ? trim($_POST['bosh_proxy']) : '');
+ $central_userbase = (!empty($_POST['central_userbase']) ? intval($_POST['central_userbase']) : false);
+
+ DI::config()->set('xmpp', 'bosh_proxy', $bosh_proxy);
+ DI::config()->set('xmpp', 'central_userbase', $central_userbase);
+
+ info(DI::l10n()->t('Settings updated.') . EOL);
}
function xmpp_script(App $a)
@@ -131,36 +136,36 @@ function xmpp_converse(App $a)
return;
}
- if ($_GET["mode"] == "minimal") {
+ if (($_GET['mode'] ?? '') == 'minimal') {
return;
}
- if ($a->is_mobile || $a->is_tablet) {
+ if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
return;
}
- if (!PConfig::get(local_user(), "xmpp", "enabled")) {
+ if (!DI::pConfig()->get(local_user(), "xmpp", "enabled")) {
return;
}
- if (in_array($a->query_string, ["admin/federation/"])) {
+ if (in_array(DI::args()->getQueryString(), ["admin/federation/"])) {
return;
}
- $a->page['htmlhead'] .= '' . "\n";
- $a->page['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
- if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) {
- $bosh_proxy = Config::get("xmpp", "bosh_proxy");
+ if (DI::config()->get("xmpp", "central_userbase") && !DI::pConfig()->get(local_user(), "xmpp", "individual")) {
+ $bosh_proxy = DI::config()->get("xmpp", "bosh_proxy");
- $password = PConfig::get(local_user(), "xmpp", "password", '', true);
+ $password = DI::pConfig()->get(local_user(), "xmpp", "password", '', true);
if ($password == "") {
- $password = random_string(16);
- PConfig::set(local_user(), "xmpp", "password", $password);
+ $password = Strings::getRandomHex(16);
+ DI::pConfig()->set(local_user(), "xmpp", "password", $password);
}
- $jid = $a->user["nickname"] . "@" . $a->get_hostname() . "/converse-" . random_string(5);
+ $jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5);
$auto_login = "auto_login: true,
authentication: 'login',
@@ -168,7 +173,7 @@ function xmpp_converse(App $a)
password: '$password',
allow_logout: false,";
} else {
- $bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
+ $bosh_proxy = DI::pConfig()->get(local_user(), "xmpp", "bosh_proxy");
$auto_login = "";
}
@@ -177,7 +182,7 @@ function xmpp_converse(App $a)
return;
}
- if (in_array($a->argv[0], ["manage", "logout"])) {
+ if (in_array($a->argv[0], ["delegation", "logout"])) {
$additional_commands = "converse.user.logout();\n";
} else {
$additional_commands = "";
@@ -208,7 +213,7 @@ function xmpp_converse(App $a)
xhr_user_search: false
});\n";
- $a->page['htmlhead'] .= "