Browse Source

- Fix presence initialisation on some XMPP servers (ejabberd)

- Show the presence value with the presence bubble in the sidebar
pull/16/head
Jaussoin Timothée 11 years ago
parent
commit
4284616b0e
  1. 4
      app/views/main.tpl
  2. 1
      app/widgets/Presence/Presence.php
  3. 2
      app/widgets/Presence/_presence.tpl
  4. 6
      linker.php

4
app/views/main.tpl

@ -1,5 +1,3 @@
<?php $this->widget('Init');?>
<nav class="color dark">
<?php $this->widget('Navigation');?>
<?php $this->widget('Presence');?>
@ -11,3 +9,5 @@
<?php $this->widget('Hello');?>
</section>
</main>
<?php $this->widget('Init');?>

1
app/widgets/Presence/Presence.php

@ -172,6 +172,7 @@ class Presence extends WidgetBase
$presencetpl->assign('me', $contact);
$presencetpl->assign('presence', $presence);
$presencetpl->assign('presencetxt', getPresencesTxt());
$presencetpl->assign('dialog', $this->call('ajaxOpenDialog'));
$html = $presencetpl->draw('_presence', true);

2
app/widgets/Presence/_presence.tpl

@ -2,7 +2,7 @@
<div class="action">
<i class="md md-edit"></i>
</div>
<span class="icon bubble" style="background-image: url({$me->getPhoto('m')})"></span>
<span class="icon bubble status {$presencetxt[$presence->value]}" style="background-image: url({$me->getPhoto('m')})"></span>
<span>{$me->getTrueName()}</span>
<p class="wrap">{$presence->status}</p>
</li>

6
linker.php

@ -45,7 +45,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
$conn->on('message', function($message) use ($conn, $loop) {
if($message != '') {
#fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
if($message == '</stream:stream>') {
$conn->close();
@ -76,7 +76,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
}
if(!empty($xml)) {
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
$conn->send(trim($xml));
}
}
@ -118,7 +118,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st
\Moxl\API::clear();
if(!empty($xml)) {
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
$conn->send(trim($xml));
}

Loading…
Cancel
Save