Add packet index sorting

* Reverts 54d9fa2
* Removes pagination, which was disliked by users

Author: carlbennett

src/controllers/Packet/Index.php

@@ -23,10 +23,43 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model = new PacketIndexModel();
 
-    $model->packets = Packet::getAllPackets(
-      ['packet_application_layer_id,packet_id', 'ASC']
+    $query = $router->getRequestQueryArray();
+
+    $model->order = (
+      isset( $query['order'] ) ? $query['order'] : 'packet-id-asc'
     );
 
+    switch ( $model->order ) {
+      case 'created-datetime-asc':
+        $order = [ 'created_datetime','ASC' ]; break;
+
+      case 'created-datetime-desc':
+        $order = [ 'created_datetime','DESC' ]; break;
+
+      case 'id-asc':
+        $order = [ 'id','ASC' ]; break;
+
+      case 'id-desc':
+        $order = [ 'id','DESC' ]; break;
+
+      case 'packet-id-asc':
+        $order = [ 'packet_application_layer_id,packet_id','ASC' ]; break;
+
+      case 'packet-id-desc':
+        $order = [ 'packet_application_layer_id,packet_id','DESC' ]; break;
+
+      case 'user-id-asc':
+        $order = [ 'user_id','ASC' ]; break;
+
+      case 'user-id-desc':
+        $order = [ 'user_id','DESC' ]; break;
+
+      default:
+        $order = null;
+    }
+
+    $model->packets = Packet::getAllPackets( $order );
+
     if ( !( $view instanceof PacketIndexHtmlView
       || $view instanceof PacketIndexJSONView )) {
 

src/libraries/Packet.php

@@ -126,7 +126,7 @@ public static function &getAllPackets(
 
     if ( empty( $limit_clause )) {
 
-      $ckey = 'bnetdocs-packets';
+      $ckey = 'bnetdocs-packets-' . hash('md5', $order[0] . $order[1]);
       $cval = Common::$cache->get( $ckey );
 
       if ( $cval !== false && !empty( $cval )) {

src/models/Packet/Index.php

@@ -6,6 +6,7 @@
 
 class Index extends Model {
 
+  public $order;
   public $packets;
   public $timestamp;
   public $user;

src/templates/Packet/Index.phtml

@@ -11,12 +11,45 @@ $title       = 'Packet Index';
 $description = 'The index for packets on BNETDocs';
 $this->opengraph->attach(new Pair('url', '/packet/index'));
 
+$order = $this->getContext()->order;
+
 $this->additional_css[] = '/a/forms.css';
 require('./header.inc.phtml');
 ?>
       <article>
         <header>Packet Index</header>
         <section>
+          <form method="GET">
+            <label for="order">Order by:</label>
+            <select name="order" id="order" onchange="form.submit();"
+              style="display:inline-block;width:200px;">
+              <option value="created-datetime-asc"<?php
+                if ($order === 'created-datetime-asc') { echo ' selected="selected"';
+                } ?>>Created Timestamp (Ascending)</option>
+              <option value="created-datetime-desc"<?php
+                if ($order === 'created-datetime-desc') { echo ' selected="selected"';
+                } ?>>Created Timestamp (Descending)</option>
+              <option value="id-asc"<?php
+                if ($order === 'id-asc') { echo ' selected="selected"';
+                } ?>>Database Id (Ascending)</option>
+              <option value="id-desc"<?php
+                if ($order === 'id-desc') { echo ' selected="selected"';
+                } ?>>Database Id (Descending)</option>
+              <option value="packet-id-asc"<?php
+                if ($order === 'packet-id-asc') { echo ' selected="selected"';
+                } ?>>Packet Id (Ascending)</option>
+              <option value="packet-id-desc"<?php
+                if ($order === 'packet-id-desc') { echo ' selected="selected"';
+                } ?>>Packet Id (Descending)</option>
+              <option value="user-id-asc"<?php
+                if ($order === 'user-id-asc') { echo ' selected="selected"';
+                } ?>>User Id (Ascending)</option>
+              <option value="user-id-desc"<?php
+                if ($order === 'user-id-desc') { echo ' selected="selected"';
+                } ?>>User Id (Descending)</option>
+            </select>
+            <input type="submit" value="Reorder"/>
+          </form>
           <table>
             <thead>
               <tr>