Basic system wide messaging and individual account messaging working.

application/controllers/messagesController.php

@@ -229,6 +229,15 @@ class messagesController extends Staple_Controller
         $messages = new messagesModel();
         $this->view->messages = $messages;
     }
+
+    public function accountexpired()
+    {
+        $messages = new messagesModel();
+        //$this->view->messages = $messages;
+
+        $this->view->messages = $messages->getExpiredPrivateMessages();
+
+    }
 }
 
 ?>

application/models/messagesModel.php

@@ -105,7 +105,7 @@ class messagesModel extends Staple_Model
         $date->setTime(23,59,59);
         $timestamp = $date->format('U');
 
-        $sql = "SELECT id FROM messages WHERE expireDate < $timestamp ORDER BY postDate ASC";
+        $sql = "SELECT id FROM messages WHERE expireDate < '$timestamp' ORDER BY postDate ASC";
 
         $query = $this->db->query($sql);
         $data = array();
@@ -124,16 +124,16 @@ class messagesModel extends Staple_Model
         $date->setTime(23,59,59);
         $timestamp = $date->format('U');
 
-        $sql = "SELECT id FROM privateMessages WHERE expireDate < $timestamp ORDER BY postDate ASC";
+        $sql = "SELECT id FROM privateMessages WHERE expireDate < '$timestamp' ORDER BY postDate ASC";
 
         $query = $this->db->query($sql);
         $data = array();
         while($result = $query->fetch_assoc())
         {
+            $id = $result['id'];
             $message = new privateMessageModel();
-            $data[] = $message->load($result['id']);
+            $data[] = $message->load($id);
         }
-
         return $data;
     }
 

application/models/privateMessageModel.php

@@ -171,6 +171,16 @@ class privateMessageModel extends messagesModel
         return $result;
     }
 
+    function loadexpired($id)
+    {
+        $sql = "SELECT * FROM privateMessages WHERE id = '".$this->db->real_escape_string($id)."'";
+
+        $query = $this->db->query($sql);
+        $result = $query->fetch_assoc();
+
+        return $result;
+    }
+
     function supervisorLoad($id)
     {
         $user = new userModel();

application/views/index/index.phtml

@@ -137,7 +137,7 @@ if(count($this->messages->systemMessages) > 0)
         $total = $this->messages->totalPrivateMessages;
         $i = 1;
 
-        echo "<h2 id=\"modalTitle\"><i class=\"fa fa-envelope\"></i> New Message <small>$i of $total</small></h2>";
+        echo "<h2 id=\"modalTitle\"><i class=\"fa fa-envelope\"></i> New Message <small></small></h2>";
         foreach ($this->messages->privateMessages as $message)
         {
             echo "

application/views/messages/account.phtml

@@ -6,7 +6,6 @@
         <div class="small-6 columns right">
             <ul class="button-group radius right">
                 <li><a href="#" data-reveal-id="newMessage" class="button success"><i class="fa fa-plus"></i> New Message</a></li>
-                <li><a href="<?php echo $this->link(array('messages','expired')) ?>" class="button secondary"><i class="fa fa-history"></i> Expired</a></li>
             </ul>
         </div>
     </div>

application/views/messages/accountexpired.phtml

@@ -0,0 +1,53 @@
+<div class="section">
+    <div class="row">
+        <div class="small-12 columns">
+            <h1><i class="fa fa-history"></i> Expired Messages</h1>
+        </div>
+        <div class="small-12 columns">
+            <?php
+
+            if(count($this->messages->expiredPrivateMessages) > 0)
+            {
+                echo "
+                        <table width='100%'>
+                            <thead>
+                                <tr>
+                                    <th>Post Date</th>
+                                    <th>Message</th>
+                                    <th>Expiration Date (EOD)</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                    ";
+                foreach($this->messages->expiredPrivateMessages as $message)
+                {
+                    $date = new DateTime();
+                    $date->setTimestamp($message['expireDate']);
+
+                    echo "
+
+                            <tr>
+                                <td>".$message['postDate']."</td>
+                                <td>".$message['message']."</td>
+                                <td>".$date->format('l, F jS Y')."</td>
+                            </tr>
+
+                        ";
+                }
+                echo "</tbody></table>";
+            }
+            else
+            {
+                echo "<div class='small-12 columns text-center'>- No expired messages -</div>";
+            }
+
+            ?>
+        </div>
+    </div>
+</div>
+
+<div id="newMessage" class="reveal-modal small" data-reveal aria-labelledby="New Message" aria-hidden="true" role="dialog">
+    <h2 id="modalTitle"><i class="fa fa-plus"></i> New Message</h2>
+    <?php echo $this->form; ?>
+    <a class="close-reveal-modal" aria-label="Close">&#215;</a>
+</div>

application/views/messages/index.phtml

@@ -6,7 +6,6 @@
         <div class="small-6 columns right">
             <ul class="button-group radius right">
                 <li><a href="#" data-reveal-id="newMessage" class="button success"><i class="fa fa-plus"></i> New Message</a></li>
-                <li><a href="<?php echo $this->link(array('messages','expired')) ?>" class="button secondary"><i class="fa fa-history"></i> History</a></li>
             </ul>
         </div>
     </div>