Fix file handling in messages

app/Message.php

@@ -24,15 +24,21 @@ class Message extends Model
         return $this->belongsTo('App\User');
     }
 
-    /*public function getFileAttribute()
+    public function setFileAttribute(array $file)
     {
-        return unserialize($this->attributes['file']);
+        $this->attributes['file'] = serialize($file);
     }
 
-    public function setFileAttribute($file)
+    public function getFileAttribute()
     {
-        $this->attributes['file'] = serialize($file);
-    }*/
+        if (isset($this->attributes['file'])) {
+            $file = unserialize($this->attributes['file']);
+            $file['size'] = sizeToCleanSize($file['size']);
+            return $file;
+        }
+
+        return null;
+    }
 
     public static function findByStanza($stanza)
     {

app/widgets/Chat/Chat.php

@@ -318,21 +318,9 @@ class Chat extends \Movim\Widget\Base
             $m->published   = gmdate('Y-m-d H:i:s');
         }
 
-
         // TODO: make this boolean configurable
         $m->markable = true;
 
-        /*if ($replace != false) {
-            $m->newid     = Uuid::uuid4();
-            $m->id        = $replace->id;
-            $m->edited    = true;
-            $m->published = $replace->published;
-            $m->delivered = $replace->delivered;
-        } else {
-            $m->id        = Uuid::uuid4();
-            $m->published = gmdate('Y-m-d H:i:s');
-        }*/
-
         $session    = Session::start();
 
         $m->type    = 'chat';
@@ -686,7 +674,7 @@ class Chat extends \Movim\Widget\Base
         $message->jidfrom = echapJS($message->jidfrom);
 
         // Attached file
-        /*if (isset($message->file)) {
+        if (isset($message->file)) {
             if ($message->body == $message->file['uri']) {
                 $message->body = null;
             }
@@ -702,9 +690,7 @@ class Chat extends \Movim\Widget\Base
             && $message->file['size'] <= SMALL_PICTURE_LIMIT) {
                 $message->audio = $message->file['uri'];
             }
-
-            $message->file['size'] = sizeToCleanSize($message->file['size']);
-        }*/
+        }
 
         if (isset($message->html)) {
             $message->body = $message->html;

app/widgets/Upload/Upload.php

@@ -38,7 +38,7 @@ class Upload extends \Movim\Widget\Base
     {
         $upload = App\User::me()->session->getUploadService();
 
-        if ($uload) {
+        if ($upload) {
             $r = new Request;
             $r->setTo($upload->node)
               ->setName($file->name)