Fixed xmlns attribute placing

Fixes venomous0x#634
Fixes venomous0x#29
Fixes venomous0x#637

src/php/WhatsAppEvent.php

@@ -646,11 +646,10 @@ function fireMessageReceivedServer(
         $phone,
         $from,
         $msgid,
-        $type,
-        $time
+        $type
     ) {
-        $callbackEvent = function(WhatsAppEventListener $listener) use ($phone, $from, $msgid, $type, $time) {  
-            $listener->onMessageReceivedServer($phone, $from, $msgid, $type, $time);
+        $callbackEvent = function(WhatsAppEventListener $listener) use ($phone, $from, $msgid, $type) {
+            $listener->onMessageReceivedServer($phone, $from, $msgid, $type);
         };
         $this->fireCallback($callbackEvent);          
     }

src/php/events/WhatsAppEventListener.php

@@ -347,8 +347,7 @@ function onMessageReceivedServer(
         $phone, // The user phone number including the country code.
         $from, // The sender JID.
         $msgid, // The message id.
-        $type, // The message type.
-        $time // The unix time when send message notification.
+        $type // The message type.
     );
 
     function onPing(

src/php/events/WhatsAppEventListenerProxy.php

@@ -383,8 +383,7 @@ function onMessageReceivedServer(
         $phone,
         $from,
         $msgid,
-        $type,
-        $time
+        $type
     ) {
         $this->handleEvent(__FUNCTION__, func_get_args());
     }

src/php/whatsprot.class.php

@@ -1830,6 +1830,15 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru
                 $node->getChild(0)->getTag()
             );
         }
+        elseif($node->getTag() == '' && $node->getAttribute("class") == "message")
+        {
+            $this->eventManager()->fireMessageReceivedServer(
+                $this->phoneNumber,
+                $node->getAttribute('from'),
+                $node->getAttribute('id'),
+                $node->getAttribute('class')
+            );
+        }
         if ($node->getTag() == "message") {
             array_push($this->messageQueue, $node);
 
@@ -1978,15 +1987,6 @@ protected function processInboundDataNode(ProtocolNode $node, $autoReceipt = tru
                     $this->sendMessageReceived($node);
                 }
             }
-            if ($node->getChild('x') != null) {
-                $this->eventManager()->fireMessageReceivedServer(
-                    $this->phoneNumber,
-                    $node->getAttribute('from'),
-                    $node->getAttribute('id'),
-                    $node->getAttribute('type'),
-                    $node->getAttribute('t')
-                );
-            }
             if ($node->getChild('received') != null) {
                 $this->eventManager()->fireMessageReceivedClient(
                     $this->phoneNumber,
@@ -2796,9 +2796,7 @@ protected function sendSetPicture($jid, $filepath)
             $data = fread($fp, filesize($filepath));
             if ($data) {
                 //this is where the fun starts
-                $hash = array();
-                $hash["xmlns"] = "w:profile:picture";
-                $picture = new ProtocolNode("picture", $hash, null, $data);
+                $picture = new ProtocolNode("picture", null, null, $data);
 
                 $icon = createIconGD($filepath, 96, true);
                 $thumb = new ProtocolNode("picture", array("type" => "preview"), null, $icon);
@@ -2808,6 +2806,7 @@ protected function sendSetPicture($jid, $filepath)
                 $hash["id"] = $nodeID;
                 $hash["to"] = $this->getJID($jid);
                 $hash["type"] = "set";
+                $hash["xmlns"] = "w:profile:picture";
                 $node = new ProtocolNode("iq", $hash, array($picture, $thumb), null);
 
                 $this->sendNode($node);