X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmpp%2Fxmpp.php;h=81adec8486b0848f74b7a3fa208c998e6d55ddcc;hb=1030498c0980ebed11147c939837cb930802a0c4;hp=552f5f9e5cdf37935c6bb31560729eb6503c2da1;hpb=a26bfe79e97813ebe4c27fa3cb65c32669a9f2e5;p=friendica-addons.git

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 552f5f9e..81adec84 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -8,9 +8,7 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -23,14 +21,6 @@ function xmpp_install()
 	Hook::register('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
 }
 
-function xmpp_uninstall()
-{
-	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() || empty($_POST['xmpp-settings-submit'])) {
@@ -40,8 +30,6 @@ function xmpp_addon_settings_post()
 	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(L10n::t('XMPP settings updated.') . EOL);
 }
 
 function xmpp_addon_settings(App $a, &$s)
@@ -66,26 +54,26 @@ function xmpp_addon_settings(App $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>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
+	$s .= '<h3>' . DI::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>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
+	$s .= '<h3>' . DI::l10n()->t('XMPP-Chat (Jabber)') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="xmpp-settings-wrapper">';
-	$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . L10n::t('Enable Webchat') . '</label>';
+	$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . DI::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 (Config::get("xmpp", "central_userbase")) {
-		$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . L10n::t('Individual Credentials') . '</label>';
+	if (DI::config()->get("xmpp", "central_userbase")) {
+		$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . DI::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 (!Config::get("xmpp", "central_userbase") || DI::pConfig()->get(local_user(), "xmpp", "individual")) {
-		$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . L10n::t('Jabber BOSH host') . '</label>';
+	if (!DI::config()->get("xmpp", "central_userbase") || DI::pConfig()->get(local_user(), "xmpp", "individual")) {
+		$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . DI::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>';
 	}
@@ -94,7 +82,7 @@ function xmpp_addon_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="' . L10n::t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 function xmpp_login()
@@ -110,9 +98,9 @@ function xmpp_addon_admin(App $a, &$o)
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/xmpp/');
 
 	$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.')],
+		'$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.')],
 	]);
 }
 
@@ -121,10 +109,8 @@ function xmpp_addon_admin_post()
 	$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(L10n::t('Settings updated.') . EOL);
+	DI::config()->set('xmpp', 'bosh_proxy', $bosh_proxy);
+	DI::config()->set('xmpp', 'central_userbase', $central_userbase);
 }
 
 function xmpp_script(App $a)
@@ -157,8 +143,8 @@ function xmpp_converse(App $a)
 	DI::page()['htmlhead'] .= '<link type="text/css" rel="stylesheet" media="screen" href="addon/xmpp/converse/css/converse.css" />' . "\n";
 	DI::page()['htmlhead'] .= '<script src="addon/xmpp/converse/builds/converse.min.js"></script>' . "\n";
 
-	if (Config::get("xmpp", "central_userbase") && !DI::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 = DI::pConfig()->get(local_user(), "xmpp", "password", '', true);