mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-07 00:48:55 +00:00
Fix formatting for IFTTT and XMPP
This commit is contained in:
Hypolite Petovan
parent
7305ae1341
commit
dc15e9a080
2 changed files with 188 additions and 150 deletions
106
xmpp/xmpp.php
106
xmpp/xmpp.php
|
|
@ -1,42 +1,48 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Name: XMPP (Jabber)
|
||||
* Description: Embedded XMPP (Jabber) client
|
||||
* Version: 0.1
|
||||
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
function xmpp_install() {
|
||||
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_plugin_settings_post($a,$post) {
|
||||
if(! local_user() || (! x($_POST,'xmpp-settings-submit')))
|
||||
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']);
|
||||
}
|
||||
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);
|
||||
info(t('XMPP settings updated.') . EOL);
|
||||
}
|
||||
|
||||
function xmpp_plugin_settings(&$a,&$s) {
|
||||
|
||||
if(! local_user())
|
||||
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 */
|
||||
|
||||
|
|
@ -44,13 +50,13 @@ function xmpp_plugin_settings(&$a,&$s) {
|
|||
|
||||
/* Get the current state of our config variable */
|
||||
|
||||
$enabled = intval(PConfig::get(local_user(),'xmpp','enabled'));
|
||||
$enabled = intval(PConfig::get(local_user(), 'xmpp', 'enabled'));
|
||||
$enabled_checked = (($enabled) ? ' checked="checked" ' : '');
|
||||
|
||||
$individual = intval(PConfig::get(local_user(),'xmpp','individual'));
|
||||
$individual = intval(PConfig::get(local_user(), 'xmpp', 'individual'));
|
||||
$individual_checked = (($individual) ? ' checked="checked" ' : '');
|
||||
|
||||
$bosh_proxy = PConfig::get(local_user(),"xmpp","bosh_proxy");
|
||||
$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\');">';
|
||||
|
|
@ -72,9 +78,9 @@ function xmpp_plugin_settings(&$a,&$s) {
|
|||
$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">'.t('Jabber BOSH host').'</label>';
|
||||
$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="'.$bosh_proxy.'" />';
|
||||
if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
|
||||
$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . 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>';
|
||||
}
|
||||
|
||||
|
|
@ -83,68 +89,77 @@ function xmpp_plugin_settings(&$a,&$s) {
|
|||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
|
||||
|
||||
}
|
||||
|
||||
function xmpp_login($a,$b) {
|
||||
function xmpp_login()
|
||||
{
|
||||
if (!$_SESSION["allow_api"]) {
|
||||
$password = substr(random_string(),0,16);
|
||||
PConfig::set(local_user(), "xmpp", "password", $password);
|
||||
}
|
||||
}
|
||||
|
||||
function xmpp_plugin_admin(&$a, &$o){
|
||||
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('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''),
|
||||
'$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);
|
||||
Config::set('xmpp','bosh_proxy',$bosh_proxy);
|
||||
Config::set('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);
|
||||
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;
|
||||
}
|
||||
|
||||
if ($a->is_mobile || $a->is_tablet)
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!PConfig::get(local_user(),"xmpp","enabled"))
|
||||
if (!PConfig::get(local_user(), "xmpp", "enabled")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (in_array($a->query_string, array("admin/federation/")))
|
||||
if (in_array($a->query_string, array("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";
|
||||
|
||||
if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(),"xmpp","individual")) {
|
||||
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");
|
||||
|
||||
if ($password == "") {
|
||||
$password = substr(random_string(),0,16);
|
||||
$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',
|
||||
|
|
@ -157,13 +172,15 @@ function xmpp_converse(&$a,&$s) {
|
|||
$auto_login = "";
|
||||
}
|
||||
|
||||
if ($bosh_proxy == "")
|
||||
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 = "";
|
||||
|
||||
|
|
@ -200,4 +217,3 @@ function xmpp_converse(&$a,&$s) {
|
|||
});
|
||||
</script>";
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue