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

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index e589f922..81adec84 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -4,28 +4,21 @@
  * Description: Embedded XMPP (Jabber) client
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-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');
-}
-
-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::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_addon_settings_post()
@@ -34,11 +27,9 @@ function xmpp_addon_settings_post()
 		return;
 	}
 
-	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);
+	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'] ?? '');
 }
 
 function xmpp_addon_settings(App $a, &$s)
@@ -49,40 +40,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'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/xmpp/xmpp.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/xmpp/xmpp.css' . '" media="all" />' . "\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 .= '<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") || 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>';
 	}
@@ -91,37 +82,35 @@ 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()
 {
 	if (empty($_SESSION['allow_api'])) {
-		$password = random_string(16);
-		PConfig::set(local_user(), 'xmpp', 'password', $password);
+		$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' => 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.')],
+	$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 = ((!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);
+	$bosh_proxy = (!empty($_POST['bosh_proxy']) ? trim($_POST['bosh_proxy']) : '');
+	$central_userbase = (!empty($_POST['central_userbase']) ? intval($_POST['central_userbase']) : false);
 
-	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)
@@ -135,36 +124,36 @@ function xmpp_converse(App $a)
 		return;
 	}
 
-	if (defaults($_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'] .= '<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";
+	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") && !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',
@@ -172,7 +161,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 = "";
 	}
@@ -181,7 +170,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 = "";
@@ -212,7 +201,7 @@ function xmpp_converse(App $a)
 					xhr_user_search: false
 				});\n";
 
-	$a->page['htmlhead'] .= "<script>
+	DI::page()['htmlhead'] .= "<script>
 					require(['converse'], function (converse) {
 						$initialize
 						converse.listen.on('ready', function (event) {