From 4284616b0e0c2ff13df005f306fdfe7d3e74c7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Wed, 4 Mar 2015 00:17:23 +0100
Subject: [PATCH] - Fix presence initialisation on some XMPP servers (ejabberd)
 - Show the presence value with the presence bubble in the sidebar

---
 app/views/main.tpl                 | 4 ++--
 app/widgets/Presence/Presence.php  | 1 +
 app/widgets/Presence/_presence.tpl | 2 +-
 linker.php                         | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/main.tpl b/app/views/main.tpl
index c29bb225a..ec6fd6b59 100755
--- a/app/views/main.tpl
+++ b/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');?>
diff --git a/app/widgets/Presence/Presence.php b/app/widgets/Presence/Presence.php
index 79aa9867c..451aa6ba4 100755
--- a/app/widgets/Presence/Presence.php
+++ b/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);
diff --git a/app/widgets/Presence/_presence.tpl b/app/widgets/Presence/_presence.tpl
index bd9046e3f..371d7ee92 100644
--- a/app/widgets/Presence/_presence.tpl
+++ b/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>
diff --git a/linker.php b/linker.php
index 98463048a..ba71d19fc 100755
--- a/linker.php
+++ b/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));
                 }