2 files changed, 49 insertions, 3 deletions

diff --git a/htdocs/src/Post.inc.php b/htdocs/src/Post.inc.php
index a4d34f7..22d2fce 100644
--- a/htdocs/src/Post.inc.php
+++ b/htdocs/src/Post.inc.php
@@ -31,7 +31,7 @@ class Post {
     }
 
     private static function getPost($where) {
-        $query = "SELECT * FROM post WHERE $where";
+        $query = "SELECT *, UNIX_TIMESTAMP(created) AS createdts FROM post WHERE $where";
 
         $db = getDatabase();
         
@@ -59,7 +59,11 @@ class Post {
     }
 
     public function getName() {
-        return $this->info['name'];
+        return htmlspecialchars($this->info['name']);
+    }
+
+    public function getDescription() {
+        return htmlspecialchars($this->info['description']);
     }
 
     public function getStage() {
@@ -77,6 +81,30 @@ class Post {
     public function getCreated() {
         return $this->info['created'];
     }
+
+    public function getAge() {
+        $diff = time() - $this->info['createdts'];
+
+        if ($diff < 60) {
+            return floor($diff) ." seconds ago";
+
+        } else if ($diff < 3600) {
+            return floor($diff / 60) ." minutes ago";
+
+        } else if ($diff < 86400) {
+            return floor($diff / 3600) ." hours ago";
+
+        } else if ($diff < 604800) {
+            return floor($diff / 86400) ." days ago";
+
+        } else {
+            return floor($diff / 604800) . " weeks ago";
+        }
+    }
+
+    public function getLocation() {
+        return $this->info['location'];
+    }
 }
 
 ?>
diff --git a/htdocs/src/PostIterator.inc.php b/htdocs/src/PostIterator.inc.php
index 6106f23..52eb750 100644
--- a/htdocs/src/PostIterator.inc.php
+++ b/htdocs/src/PostIterator.inc.php
@@ -14,11 +14,15 @@ class PostIterator implements Iterator {
     private $where;
     private $rows;
     private $position;
+    private $order;
+    private $limit;
 
     public function __construct() {
         $this->where = array();
         $this->rows = array();
         $this->position = 0;
+        $this->order = "created desc";
+        $this->limit = 0;
     }
 
     public function filterStage($stage) {
@@ -29,6 +33,14 @@ class PostIterator implements Iterator {
         $this->where[] = "source_id='$source'";
     }
 
+    public function orderBy($order) {
+        $this->order = $order;
+    }
+
+    public function limit($limit) {
+        $this->limit = limit;
+    }
+
     public function rewind() {
         $this->position = 0;
     }
@@ -50,13 +62,19 @@ class PostIterator implements Iterator {
     }
 
     public function query() {
-        $query = "SELECT * FROM post"; 
+        $query = "SELECT *, UNIX_TIMESTAMP(created) AS createdts FROM post"; 
         
         if (count($this->where) > 0) {
             $where = join(' AND ', $this->where);
             $query .= " WHERE $where";
         }
 
+        $query .= " ORDER BY ". $this->order;
+
+        if ($this->limit != 0) {
+            $query .= " LIMIT ". $this->limit;
+        }
+
         $db = getDatabase();
 
         $this->rows = $db->fetchAssocRows($query);