- Update the locales

- Fix some CSS issues
- Fix the HTML chat messages display
- Fix the loaded language value in the running daemon

app/widgets/Chat/_chat_messages.tpl

@@ -20,7 +20,7 @@
                     <i class="md md-lock"></i> {$c->__('message.encrypted')}
                 {else}
                     {if="isset($value->html)"}
-                        {$value->body}
+                        {$value->html|prepareString}
                     {else}
                         {$value->body|htmlentities:ENT_COMPAT,'UTF-8'|prepareString}
                     {/if}

app/widgets/Chats/Chats.php

@@ -56,7 +56,7 @@ class Chats extends WidgetCommon
         $chats = Cache::c('chats');
         if($chats == null) $chats = array();
 
-        if(!array_key_exists($jid, $chats)) {
+        if(!array_key_exists($jid, $chats) && $jid != $this->user->getLogin()) {
             $chats[$jid] = 1;
             Cache::c('chats', $chats);
 

app/widgets/Chats/locales.ini

@@ -1,5 +1,5 @@
 [chats]
-chats.empty             = 'Open a new conversation here by clicking on the plus button bellow'
+chats.empty             = 'Open a new conversation by clicking on the plus button in the header'
 chats.add               = 'Chat with a contact'
 
 [message]

app/widgets/Config/Config.php

@@ -70,7 +70,8 @@ class Config extends WidgetBase
         Notification::append(null, $this->__('config.updated'));
     }
 
-    function ajaxSubmit($data) {
+    function ajaxSubmit($data)
+    {
         $config = $this->user->getConfig();
         if(isset($config))
             $data = array_merge($config, $data);

app/widgets/Config/locales.ini

@@ -9,5 +9,5 @@ config.pattern              = 'Pattern'
 config.info                 = 'This configuration is shared wherever you are connected !'        
 config.updated              = 'Configuration updated'
 
-notifications.message       = 'Notifify on incoming message'
+notifications.message       = 'Notify on incoming message'
 notifications.desktop       = 'Use desktop notifications'

app/widgets/Login/login.css

@@ -48,6 +48,7 @@ body main {
 
 #login_widget form ul input {
     margin: 0;
+    display: block;
 }
 
 ul.admin {

app/widgets/Presence/Presence.php

@@ -127,7 +127,7 @@ class Presence extends WidgetBase
           ->request();
     }
 
-        // We refresh the bookmarks
+    // We refresh the bookmarks
     function ajaxBookmarksGet()
     {
         $session = \Sessionx::start();
@@ -136,6 +136,15 @@ class Presence extends WidgetBase
           ->request();
     }
 
+    // We refresh the user (local) configuration
+    function ajaxUserRefresh()
+    {
+        $language = $this->user->getConfig('language');
+        if(isset($language)) {
+            loadLanguage($language);
+        }
+    }
+
     function ajaxOpenDialog()
     {
         Dialog::fill($this->preparePresenceList());

app/widgets/Presence/presence.js

@@ -7,6 +7,7 @@ function postStart() {
         //Presence_ajaxConfigGet();
         Presence_ajaxServerCapsGet();
         Presence_ajaxBookmarksGet();
+        Presence_ajaxUserRefresh();
         //Menu_ajaxRefresh();
         localStorage.postStart = 0;
     }

app/widgets/Rooms/_rooms_list.tpl

@@ -4,12 +4,12 @@
     <ul>
         {$presence = getPresencesTxt()}
         {loop="$list"}
-            <li>
+            <li class="action">
                 <span class="icon bubble status {$presence[$value->value]}">
                     <img src="{$value->getPhoto('s')}" />
                 </span>
                 {if="$value->mucaffiliation =='owner'"}
-                    <div class="control">
+                    <div class="action">
                         <i class="md md-beenhere"></i>
                     </div>
                 {/if}

bootstrap.php

@@ -212,6 +212,7 @@ class Bootstrap {
      */
     function loadLanguage() {
         $user = new User();
+        $user->reload();
 
         $cd = new \Modl\ConfigDAO();
         $config = $cd->get();

system/RPC.php

@@ -88,9 +88,6 @@ class RPC
 
         $result = array();
 
-        $bc = new Bootstrap;
-        $bc->loadLanguage();
-
         // Preparing the parameters and calling the function.
         if(isset($request->params)) {
             $params = (array)$request->params;

system/Sessionx.php

@@ -155,7 +155,6 @@ class Sessionx {
                         'host',
                         'domain',
                         'user',
-                        'config',
                         'password',
                         'start')
                     )

system/User.php

@@ -36,19 +36,30 @@ class User {
         if($session->active) {   
             $this->username = $session->user.'@'.$session->host;
 
-            if($session->config)
-                $this->config = $session->config;
+            //$this->reload();
 
-            $cd = new \Modl\ConfigDAO();
-            $config = $cd->get();
-        
-            $this->sizelimit = (int)$config->sizelimit;
+            //$this->sizelimit = (int)$config->sizelimit;
 
             $this->userdir = DOCUMENT_ROOT.'/users/'.$this->username.'/';
             $this->useruri = BASE_URI.'users/'.$this->username.'/';
         }
     }
 
+    /**
+     * @brief Reload the user configuration
+     */
+    function reload()
+    {
+        $session = \Sessionx::start();
+        if($session->config) {
+            $this->config = $session->config;
+            $lang = $this->getConfig('language');
+            if(isset($lang)) {
+                loadLanguage($lang);
+            }
+        }
+    }
+    
     /**
      * Get the current size in bytes of the user directory
      */
@@ -131,6 +142,7 @@ class User {
     {
         $session = \Sessionx::start();
         $session->config = $config;
+        $this->reload();
     }
 
     function getConfig($key = false)

themes/material/css/list.css

@@ -158,7 +158,7 @@ ul li div.bubble {
     background-color: #E5E5E5;
     border-color: #E5E5E5;
 
-    word-break: break-all;
+    /*word-break: break-all;*/
 }
 
 ul li div.bubble:after {