X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=xmpp%2Fxmpp.php;h=d80abb64cf1e7309adaf23c7414adc8facfb57cb;hb=7f1fda43aea76a01dfaffba565af94cd2eb28ead;hp=867a3c06b6174f4b724cfda38a19b2cbc53d763e;hpb=dc15e9a08037c648ff639051fb58c36db64def6b;p=friendica-addons.git
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 867a3c06..d80abb64 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -1,44 +1,48 @@
*/
+
use Friendica\App;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
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');
+ 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');
+ 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()
+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);
+ PConfig::set(local_user(), 'xmpp', 'enabled', defaults($_POST, 'xmpp_enabled', false));
+ PConfig::set(local_user(), 'xmpp', 'individual', defaults($_POST, 'xmpp_individual', false));
+ PConfig::set(local_user(), 'xmpp', 'bosh_proxy', defaults($_POST, 'xmpp_bosh_proxy', ''));
+
+ info(L10n::t('XMPP settings updated.') . EOL);
}
-function xmpp_plugin_settings(App $a, &$s)
+function xmpp_addon_settings(App $a, &$s)
{
if (!local_user()) {
return;
@@ -46,7 +50,7 @@ function xmpp_plugin_settings(App $a, &$s)
/* Add our stylesheet to the xmpp so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variable */
@@ -60,26 +64,26 @@ function xmpp_plugin_settings(App $a, &$s)
/* Add some HTML to the existing form */
$s .= '';
- $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '' . L10n::t('XMPP-Chat (Jabber)') . '
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '' . L10n::t('XMPP-Chat (Jabber)') . '
';
$s .= '';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
if (Config::get("xmpp", "central_userbase")) {
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
}
if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
}
@@ -88,35 +92,37 @@ function xmpp_plugin_settings(App $a, &$s)
/* provide a submit button */
- $s .= '
';
+ $s .= '
';
}
function xmpp_login()
{
- if (!$_SESSION["allow_api"]) {
- $password = substr(random_string(),0,16);
- PConfig::set(local_user(), "xmpp", "password", $password);
+ if (empty($_SESSION['allow_api'])) {
+ $password = random_string(16);
+ PConfig::set(local_user(), 'xmpp', 'password', $password);
}
}
-function xmpp_plugin_admin(App $a, &$o)
+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, array(
- '$submit' => t('Save Settings'),
- '$bosh_proxy' => array('bosh_proxy', t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''),
- '$central_userbase' => array('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' => 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()
+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);
+ $bosh_proxy = ((!empty($_POST['bosh_proxy'])) ? trim($_POST['bosh_proxy']) : '');
+ $central_userbase = ((!empty($_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);
+
+ info(L10n::t('Settings updated.') . EOL);
}
function xmpp_script(App $a)
@@ -130,7 +136,7 @@ function xmpp_converse(App $a)
return;
}
- if ($_GET["mode"] == "minimal") {
+ if (defaults($_GET, "mode", '') == "minimal") {
return;
}
@@ -142,7 +148,7 @@ function xmpp_converse(App $a)
return;
}
- if (in_array($a->query_string, array("admin/federation/"))) {
+ if (in_array($a->query_string, ["admin/federation/"])) {
return;
}
@@ -152,14 +158,14 @@ function xmpp_converse(App $a)
if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) {
$bosh_proxy = Config::get("xmpp", "bosh_proxy");
- $password = PConfig::get(local_user(), "xmpp", "password");
+ $password = PConfig::get(local_user(), "xmpp", "password", '', true);
if ($password == "") {
$password = random_string(16);
PConfig::set(local_user(), "xmpp", "password", $password);
}
- $jid = $a->user["nickname"] . "@" . $a->get_hostname() . "/converse-" . random_string(5);
+ $jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . random_string(5);
$auto_login = "auto_login: true,
authentication: 'login',
@@ -176,7 +182,7 @@ function xmpp_converse(App $a)
return;
}
- if (in_array($a->argv[0], array("manage", "logout"))) {
+ if (in_array($a->argv[0], ["manage", "logout"])) {
$additional_commands = "converse.user.logout();\n";
} else {
$additional_commands = "";