X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=xmpp%2Fxmpp.php;h=d9335483a8408c74dae266aed9710af2bc50226d;hp=7ac7eb3b9816ffbf637eae62af1757749696f6df;hb=d9330e3b05c71bbd172293fb223271033d3b19f7;hpb=9ac7e18bdd6e0f9a513109edcc767f59af824e24
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 7ac7eb3b..d9335483 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -1,91 +1,188 @@
*/
-
-function xmpp_install() {
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
+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');
}
-function xmpp_uninstall() {
+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');
}
-function xmpp_login($a,$b) {
+function xmpp_plugin_settings_post()
+{
+ if (!local_user() || (!x($_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);
+}
+
+function xmpp_plugin_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'] .= '' . "\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 .= '';
+ $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= '' . t('XMPP-Chat (Jabber)') . '
';
+ $s .= '';
+
+ $s .= '
';
+ $s .= '
';
+ $s .= '
';
+ $s .= '
';
+
+ if (Config::get("xmpp", "central_userbase")) {
+ $s .= '
';
+ $s .= '
';
+ $s .= '
';
+ }
+
+ if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
+ $s .= '
';
+ $s .= '
';
+ $s .= '
';
+ }
+
+ $s .= '
';
+
+ /* provide a submit button */
+
+ $s .= '
';
+}
+
+function xmpp_login()
+{
if (!$_SESSION["allow_api"]) {
- $password = substr(random_string(),0,16);
- set_pconfig(local_user(), "xmpp", "password", $password);
+ $password = random_string(16);
+ PConfig::set(local_user(), "xmpp", "password", $password);
}
}
-function xmpp_plugin_admin(&$a, &$o){
- $t = get_markup_template("admin.tpl", "addon/xmpp/");
+function xmpp_plugin_admin(App $a, &$o)
+{
+ $t = get_markup_template("admin.tpl", "addon/xmpp/");
- $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.')),
- ));
+ $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.')),
+ ));
}
-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_plugin_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);
}
-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 ($_GET["mode"] == "minimal")
+ if ($_GET["mode"] == "minimal") {
return;
+ }
- $a->page['htmlhead'] .= ''."\n";
- $a->page['htmlhead'] .= ''."\n";
+ if ($a->is_mobile || $a->is_tablet) {
+ return;
+ }
- $bosh_proxy = get_config("xmpp", "bosh_proxy");
+ if (!PConfig::get(local_user(), "xmpp", "enabled")) {
+ return;
+ }
- if (get_config("xmpp", "central_userbase")) {
- $password = get_pconfig(local_user(), "xmpp", "password");
+ if (in_array($a->query_string, array("admin/federation/"))) {
+ return;
+ }
+
+ $a->page['htmlhead'] .= '' . "\n";
+ $a->page['htmlhead'] .= '' . "\n";
+
+ 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", '', 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->get_hostname() . "/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 ($bosh_proxy == "") {
+ return;
+ }
- if (in_array($a->argv[0], array("manage", "logout")))
+ if (in_array($a->argv[0], array("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 +217,3 @@ function xmpp_converse(&$a,&$s) {
});
";
}
-
-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'] .= "";
-
- $a->page['htmlhead'] .= "
- ";
-}
-
-?>