X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmpp%2Fxmpp.php;h=d80abb64cf1e7309adaf23c7414adc8facfb57cb;hb=7f1fda43aea76a01dfaffba565af94cd2eb28ead;hp=7ac7eb3b9816ffbf637eae62af1757749696f6df;hpb=9ac7e18bdd6e0f9a513109edcc767f59af824e24;p=friendica-addons.git

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 7ac7eb3b..d80abb64 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -6,86 +6,189 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-function xmpp_install() {
-	register_hook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
-	register_hook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
+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()
+{
+	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('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
-	unregister_hook('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');
 }
 
-function xmpp_login($a,$b) {
-	if (!$_SESSION["allow_api"]) {
-		$password = substr(random_string(),0,16);
-		set_pconfig(local_user(), "xmpp", "password", $password);
+function xmpp_addon_settings_post()
+{
+	if (!local_user() || empty($_POST['xmpp-settings-submit'])) {
+		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);
+}
+
+function xmpp_addon_settings(App $a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	/* 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->getBaseURL() . '/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_checked = (($enabled) ? ' checked="checked" ' : '');
+
+	$individual = intval(PConfig::get(local_user(), 'xmpp', 'individual'));
+	$individual_checked = (($individual) ? ' checked="checked" ' : '');
+
+	$bosh_proxy = 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 .= '</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 .= '</span>';
+
+	$s .= '<div id="xmpp-settings-wrapper">';
+	$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . 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>';
+		$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>';
+		$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="' . $bosh_proxy . '" />';
+		$s .= '<div class="clear"></div>';
+	}
+
+	$s .= '</div>';
+
+	/* 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>';
 }
 
-function xmpp_plugin_admin(&$a, &$o){
-        $t = get_markup_template("admin.tpl", "addon/xmpp/");
+function xmpp_login()
+{
+	if (empty($_SESSION['allow_api'])) {
+		$password = random_string(16);
+		PConfig::set(local_user(), 'xmpp', 'password', $password);
+	}
+}
 
-        $o = replace_macros($t, array(
-                '$submit' => t('Save Settings'),
-                '$bosh_proxy'       => array('bosh_proxy', t('BOSH proxy'),            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_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.')],
+	]);
 }
 
-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_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);
 }
 
-function xmpp_script(&$a,&$s) {
-	xmpp_converse($a,$s);
-	//xmpp_jappix($a,$s);
+function xmpp_script(App $a)
+{
+	xmpp_converse($a);
 }
 
-function xmpp_converse(&$a,&$s) {
-	if (!local_user())
+function xmpp_converse(App $a)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (defaults($_GET, "mode", '') == "minimal") {
+		return;
+	}
+
+	if ($a->is_mobile || $a->is_tablet) {
+		return;
+	}
+
+	if (!PConfig::get(local_user(), "xmpp", "enabled")) {
 		return;
+	}
 
-	if ($_GET["mode"] == "minimal")
+	if (in_array($a->query_string, ["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";
 
-	$bosh_proxy = get_config("xmpp", "bosh_proxy");
+	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")) {
-		$password = get_pconfig(local_user(), "xmpp", "password");
+		$password = PConfig::get(local_user(), "xmpp", "password", '', true);
 
 		if ($password == "") {
-			$password = substr(random_string(),0,16);
-			set_pconfig(local_user(), "xmpp", "password", $password);
+			$password = random_string(16);
+			PConfig::set(local_user(), "xmpp", "password", $password);
 		}
 
-		$jid = $a->user["nickname"]."@".$a->get_hostname()."/converse-".substr(random_string(),0,5);;
+		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . random_string(5);
 
 		$auto_login = "auto_login: true,
 			authentication: 'login',
 			jid: '$jid',
 			password: '$password',
-			allow_logout: true,
-			auto_list_rooms: true,";
-	} else
+			allow_logout: false,";
+	} else {
+		$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
+
 		$auto_login = "";
+	}
 
-	if (in_array($a->argv[0], array("manage", "logout")))
+	if ($bosh_proxy == "") {
+		return;
+	}
+
+	if (in_array($a->argv[0], ["manage", "logout"])) {
 		$additional_commands = "converse.user.logout();\n";
-	else
+	} else {
 		$additional_commands = "";
+	}
 
 	$on_ready = "";
-	//$on_ready = "converse.rooms.open(['support@conference.pirati.ca']);\n";
-
-//  converse.contacts.add('ike@jabber.piratenpartei.de');
 
 	$initialize = "converse.initialize({
 					bosh_service_url: '$bosh_proxy',
@@ -120,60 +223,3 @@ function xmpp_converse(&$a,&$s) {
 					});
 				</script>";
 }
-
-function xmpp_jappix(&$a,&$s) {
-	if (!local_user())
-		return;
-
-	if ($_GET["mode"] == "minimal")
-		return;
-
-	$bosh_proxy = get_config("xmpp", "bosh_proxy");
-
-	if (get_config("xmpp", "central_userbase")) {
-		$password = get_pconfig(local_user(), "xmpp", "password");
-
-		if ($password == "") {
-			$password = substr(random_string(),0,16);
-			set_pconfig(local_user(), "xmpp", "password", $password);
-		}
-
-		$user = $a->user["nickname"];
-		$domain = $a->get_hostname();
-
-		$auto_login = "auto_login: true,
-			authentication: 'login',
-			jid: '$jid',
-			password: '$password',
-			allow_logout: false,";
-	} else
-		$auto_login = "";
-
-	//$a->page['htmlhead'] .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script>";
-
-	$a->page['htmlhead'] .= "<script type='text/javascript' src='addon/xmpp/jappix/javascripts/mini.js'></script>
-					<script type='text/javascript'>
-						jQuery(document).ready(function() {
-							JAPPIX_STATIC = 'addon/xmpp/jappix/';
-							HOST_BOSH = '$bosh_proxy'
-
-							JappixMini.launch({
-						           connection: {
-						             user: '$user',
-						             password: '$password',
-						             domain: '$domain'
-						           },
-						           application: {
-						             network: {
-						               autoconnect: true
-						             },
-						             interface: {
-						               showpane: false
-						             }
-						           }
-						        });
-						});
-				</script>";
-}
-
-?>