status json order; media url

status.php

@@ -29,7 +29,7 @@ function status_create()
       && getimagesize($_FILES["media"]["tmp_name"]) !== false)
   {
     global $media_path;
-    $media = dechex(time());
+    $media = dechex(microtime());
     move_uploaded_file($_FILES["media"]["tmp_name"], $media_path . $media);
   }
 
@@ -48,11 +48,12 @@ function status_create()
   $date = new DateTime($s["date"]);
 
   echo json_encode(array("status" => $s["status"],
+    "user_id" => intval($u["id"]),
     "creation_date" => $date->format(DateTime::ISO8601),
     "latitude" => $s["latitude"] === null ? null : floatval($s["latitude"]),
     "longitude" => $s["longitude"] === null ? null : floatval($s["longitude"]),
-    "id" => intval($s["id"]),
-    "user_id" => intval($u["id"])
+    "media_url" => ($s["media"] !== null ) ? $media_url . $s["media"] : null,
+    "id" => intval($s["id"])
   ));
 }
 
@@ -69,12 +70,16 @@ function status_feed()
   global $media_url;
   while (($u = $s->fetch()) !== false)
   {
-    $date = new DateTime($u['date']);
-    $data[] = array("id" => intval($u["id"]), "status" => $u["status"],
+    $a = database_exec("SELECT `id`, `username` FROM users WHERE `id` = :id",
+      array(":id" => $u["user"]))->fetch();
+    $date = new DateTime($u["date"]);
+    $data[] = array("id" => intval($u["id"]),
+    "status" => $u["status"],
     "creation_date" => $date->format(DateTime::ISO8601),
     "latitude" => $u["latitude"] === null ? null : floatval($u["latitude"]),
     "longitude" => $u["longitude"] === null ? null : floatval($u["longitude"]),
-    "author_username" => "42",
+    "author_id" => intval($a["id"]),
+    "author_username" => $a["username"],
     "nb_confirm_up" => intval($u["up"]),
     "nb_confirm_down" => intval($u["down"]),
     "media_url" => ($u["media"] !== null ) ? $media_url . $u["media"] : null);

user.php

@@ -41,7 +41,8 @@ function user_login($username = false)
   $token = hash_password(uniqid(mt_rand(), true));
   database_exec("INSERT INTO tokens (`token`, `user`) VALUES (:token, :user)",
     array(":token" => $token, ":user" => $u['id']));
-  echo json_encode(array("username" => $username, "id" => intval($u["id"]),
+  echo json_encode(array("id" => intval($u["id"]),
+    "username" => $username,
     "token" => $token));
 }
 ?>