- Fix some issues on the anonymous login

- Comment the GetMetadata in the Groups when a post is received
- Try (again) a pure socket connection

app/views/login.tpl

@@ -4,7 +4,6 @@
     <section>
         <div>
             <?php $this->widget('Login'); ?>
-            <?php $this->widget('LoginAnonymous'); ?>
         </div>
     </section>
 </main>

app/widgets/AdminTest/admintest.tpl

@@ -96,6 +96,18 @@
             <script type="text/javascript">AdminTest.disableMovim()</script>
         {/if}
 
+        {if="!extension_loaded('gd')"}
+            <li>
+                <span class="icon color bubble red">
+                    <i class="md md-image"></i>
+                </span>
+                <span>
+                    {$c->__('compatibility.gd')}
+                </span>
+            </div>
+            <script type="text/javascript">AdminTest.disableMovim()</script>
+        {/if}
+
         {if="!$c->testDir(DOCUMENT_ROOT)"}
             <li>
                 <span class="icon color bubble red">

app/widgets/AdminTest/locales.ini

@@ -6,9 +6,10 @@ compatibility.php1      = 'Update your PHP-Version: %s'
 compatibility.php2      = 'Required: 5.3.0'
 compatibility.curl      = 'Install the php5-curl library'
 compatibility.imagick   = 'Install the php5-imagick library'
+compatibility.gd        = 'Install the php5-gd library'
 compatibility.rights    = "Read and write rights for the webserver in Movim's root directory"
 compatibility.rewrite   = 'The URL Rewriting support is currently disabled'
-compatibility.db	= 'The database need to be updated, go to the database panel to fix this'
+compatibility.db        = 'The database need to be updated, go to the database panel to fix this'
 compatibility.websocket	= 'WebSocket connection error, check if the Movim Daemon is running and is reacheable'
 compatibility.xmpp_websocket	= 'XMPP Websocket connection error, please check the validity of the URL given in the General Configuration'
 

app/widgets/Group/Group.php

@@ -45,7 +45,7 @@ class Group extends WidgetCommon
         list($server, $node) = array_values($packet->content);
 
         $this->displayItems($server, $node);
-        $this->ajaxGetAffiliations($server, $node);
+        //$this->ajaxGetAffiliations($server, $node);
 
         RPC::call('Group.clearLoad');
         RPC::call('MovimTpl.showPanel');

app/widgets/Header/_header_room.tpl

@@ -1,5 +1,4 @@
 <div>
-    <span id="menu" class="on_mobile icon active" onclick="MovimTpl.toggleMenu()"><i class="md md-menu"></i></span>
-    <span class="on_desktop icon"><i class="md md-forum"></i></span>
+    <span class="icon"><i class="md md-forum"></i></span>
     <h2 class="r1">{$c->__('page.room')}</h2>
 </div>

app/widgets/LoginAnonymous/LoginAnonymous.php

@@ -6,6 +6,7 @@ class LoginAnonymous extends WidgetBase
 {
     function load()
     {
+        $this->addjs('loginanonymous.js');
         $this->registerEvent('session_start_handle', 'onStart');
     }
 
@@ -28,7 +29,7 @@ class LoginAnonymous extends WidgetBase
     {
         $validate_user = Validator::string()->length(4, 40);
         if(!$validate_user->validate($username)) {
-            Notification::append(null, 'bad username');
+            Notification::append(null, $this->__('login_anonymous.bad_username'));
             return;
         }
         

app/widgets/Rooms/locales.ini

@@ -23,6 +23,6 @@ bookmarks.updated       = 'Bookmarks updated'
 [anonymous]
 room.anonymous_title    = 'Public chatroom'
 room.anonymous_text1    = 'You are currently logued as an anonymous user.'
-room.anonymous_text2    = 'You can join using your own account or create one on the login page by login out using the cross in the top-right corner.'
+room.anonymous_text2    = 'You can join using your own account or create one on the login page by loging out using the cross in the top-right corner.'
 room.anonymous_login    = 'Login on %s'
 room.nick               = 'Your nickname'

app/widgets/Rooms/rooms.js

@@ -42,10 +42,6 @@ var Rooms = {
      * @param The jid to remember
      */
     anonymousInit : function() {
-        Presence_ajaxLogout();
-        // We register the socket
-        MovimWebsocket.connection.register('anonymous.jappix.com');
-
         MovimWebsocket.register(function()
         {
             form = document.querySelector('form[name="loginanonymous"]');

linker.php

@@ -11,11 +11,12 @@ $booted = $bootstrap->boot();
 
 $loop = React\EventLoop\Factory::create();
 
-/*$dnsResolverFactory = new React\Dns\Resolver\Factory();
+$dnsResolverFactory = new React\Dns\Resolver\Factory();
 $dns = $dnsResolverFactory->createCached('8.8.8.8', $loop);
 
-$connector = new React\SocketClient\Connector($loop, $dns);*/
-$connector = new Ratchet\Client\Factory($loop);
+$connector = new React\SocketClient\Connector($loop, $dns);
+//$connector = new React\SocketClient\SecureConnector($connector, $loop);
+//$connector = new Ratchet\Client\Factory($loop);
 $stdin = new React\Stream\Stream(STDIN, $loop);
 
 fwrite(STDERR, colorize(getenv('sid'), 'yellow')." widgets before : ".\sizeToCleanSize(memory_get_usage())."\n");
@@ -32,7 +33,7 @@ $parser = new \Moxl\Parser;
 
 $buffer = '';
 
-$stdin_behaviour = function ($data) use (/*&*/&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser) {
+$stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser) {
     //if(!isset($buffer)) $buffer = '';    
     if(substr($data, -1) == "") {
         $messages = explode("", $buffer . substr($data, 0, -1));
@@ -54,10 +55,10 @@ $stdin_behaviour = function ($data) use (/*&*/&$conn, $loop, &$buffer, &$connect
                     $cd = new \Modl\ConfigDAO();
                     $config = $cd->get();
 
-                    /*$domain = \Moxl\Utils::getDomain($msg->host);
+                    $domain = \Moxl\Utils::getDomain($msg->host);
                     fwrite(STDERR, colorize('open a socket to '.$domain, 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
-                    $connector->create($domain, 5222)->then($xmpp_behaviour);*/
-                    $connector($config->websocketurl, array('xmpp'))->then($xmpp_behaviour);
+                    $connector->create($domain, 5222)->then($xmpp_behaviour);
+                    //$connector($config->websocketurl, array('xmpp'))->then($xmpp_behaviour);
                 }
             } else {
                 return;
@@ -78,9 +79,9 @@ $stdin_behaviour = function ($data) use (/*&*/&$conn, $loop, &$buffer, &$connect
             \Moxl\API::clear();
                 
             if(!empty($xml) && $conn) {
-                //$conn->write(trim($xml));
-                $conn->send(trim($xml));
-                #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
+                $conn->write(trim($xml));
+                //$conn->send(trim($xml));
+                fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
             }
         }
 
@@ -90,8 +91,8 @@ $stdin_behaviour = function ($data) use (/*&*/&$conn, $loop, &$buffer, &$connect
     }
 };
 
-//$xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
-$xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
+$xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
+//$xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop, &$stdin, $stdin_behaviour, $parser) {
     $conn = $stream;
     fwrite(STDERR, colorize(getenv('sid'), 'yellow')." : ".colorize('linker launched', 'blue')."\n");
     fwrite(STDERR, colorize(getenv('sid'), 'yellow')." launched : ".\sizeToCleanSize(memory_get_usage())."\n");
@@ -99,8 +100,9 @@ $xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop
     $stdin->removeAllListeners('data');
     $stdin->on('data', $stdin_behaviour);
 
-    $conn->bufferSize = 4096*4;
-    $conn->on('message', function($message) use (&$conn, $loop, $parser/*, $stream*/) {
+    $conn->bufferSize = 1024;
+    //$conn->on('message', function($message) use (&$conn, $loop, $parser, $stream) {
+    $conn->on('data', function($message) use (&$conn, $loop, $parser/*, $stream*/) {
 
         //$conn->pause();
 
@@ -117,7 +119,7 @@ $xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop
                 $restart = true;
             }
 
-            #fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
+            fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n");
 
             \Moxl\API::clear();
             \RPC::clear();
@@ -130,7 +132,7 @@ $xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop
 
             if($restart) {
                 $session = \Sessionx::start();
-                \Moxl\Stanza\Stream::init($session->domain);
+                \Moxl\Stanza\Stream::init($session->host);
                 $restart = false;
             }
 
@@ -138,9 +140,9 @@ $xmpp_behaviour = function (Ratchet\Client\WebSocket $stream) use (&$conn, $loop
             \Moxl\API::clear();
 
             if(!empty($xml)) {
-                //$conn->write(trim($xml));
-                $conn->send(trim($xml));
-                #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
+                $conn->write(trim($xml));
+                //$conn->send(trim($xml));
+                fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
             }
 
             $msg = \RPC::commit();

src/Movim/Daemon/Core.php

@@ -17,7 +17,7 @@ class Core implements MessageComponentInterface {
         echo colorize("Movim daemon launched\n", 'green');
         echo colorize("Base URI :", 'green')." {$baseuri}\n";
         $ws = $this->setWebsocket($baseuri, $port);
-        echo colorize("Public WebSocket URL :", 'green')." {$ws}\n";
+        //echo colorize("Public WebSocket URL :", 'green')." {$ws}\n";
 
         $this->loop    = $loop;
         $this->baseuri = $baseuri;