Add packet id editing

Author: carlbennett

src/controllers/Packet/Edit.php

@@ -27,6 +27,7 @@ public function &run(Router &$router, View &$view, array &$args) {
     $model->csrf_token = CSRF::generate($model->csrf_id, 900); // 15 mins
     $model->error      = null;
     $model->format     = null;
+    $model->id         = null;
     $model->markdown   = null;
     $model->name       = null;
     $model->packet     = null;
@@ -50,8 +51,9 @@ public function &run(Router &$router, View &$view, array &$args) {
     } else {
       $flags = $model->packet->getOptionsBitmask();
 
-      $model->format    = $model->packet->getPacketFormat();
+      $model->id        = $model->packet->getPacketId();
       $model->name      = $model->packet->getPacketName();
+      $model->format    = $model->packet->getPacketFormat();
       $model->remarks   = $model->packet->getPacketRemarks(false);
       $model->markdown  = ($flags & Packet::OPTION_MARKDOWN);
       $model->published = ($flags & Packet::OPTION_PUBLISHED);
@@ -84,6 +86,7 @@ protected function handlePost(Router &$router, PacketEditModel &$model) {
     $csrf_id    = (isset($data["csrf_id"   ]) ? $data["csrf_id"   ] : null);
     $csrf_token = (isset($data["csrf_token"]) ? $data["csrf_token"] : null);
     $csrf_valid = CSRF::validate($csrf_id, $csrf_token);
+    $id         = (isset($data["id"        ]) ? $data["id"        ] : null);
     $name       = (isset($data["name"      ]) ? $data["name"      ] : null);
     $format     = (isset($data["format"    ]) ? $data["format"    ] : null);
     $remarks    = (isset($data["remarks"   ]) ? $data["remarks"   ] : null);
@@ -92,6 +95,7 @@ protected function handlePost(Router &$router, PacketEditModel &$model) {
     $publish    = (isset($data["publish"   ]) ? $data["publish"   ] : null);
     $save       = (isset($data["save"      ]) ? $data["save"      ] : null);
 
+    $model->id       = $id;
     $model->name     = $name;
     $model->format   = $format;
     $model->remarks  = $remarks;
@@ -116,6 +120,7 @@ protected function handlePost(Router &$router, PacketEditModel &$model) {
 
     try {
 
+      $model->packet->setPacketId($model->id);
       $model->packet->setPacketName($model->name);
       $model->packet->setPacketFormat($model->format);
       $model->packet->setPacketRemarks($model->remarks);

src/libraries/Packet.php

@@ -580,6 +580,10 @@ public function setPacketFormat($value) {
     $this->packet_format = $value;
   }
 
+  public function setPacketId($value) {
+    $this->packet_id = $value;
+  }
+
   public function setPacketName($value) {
     $this->packet_name = $value;
   }

src/models/Packet/Edit.php

@@ -11,6 +11,7 @@ class Edit extends Model {
   public $csrf_token;
   public $error;
   public $format;
+  public $id;
   public $markdown;
   public $name;
   public $packet;

src/templates/Packet/Edit.phtml

@@ -59,15 +59,23 @@ require("./header.inc.phtml");
             htmlspecialchars($this->getContext()->csrf_token, ENT_HTML5, "UTF-8");
           ?>"/>
           <section>
-            <label for="title">Name:</label><br/>
-            <input type="text" name="name" id="name" tabindex="1" required
+            <label for="id">Id:</label>
+            <em style="float:right;">(base 10 / decimal format)</em><br/>
+            <input type="text" name="id" id="id" tabindex="1" required
               autofocus="autofocus" value="<?php echo
+                filter_var($this->getContext()->id, FILTER_SANITIZE_STRING);
+              ?>"/>
+          </section>
+          <section>
+            <label for="name">Name:</label><br/>
+            <input type="text" name="name" id="name" tabindex="2" required
+              value="<?php echo
                 filter_var($this->getContext()->name, FILTER_SANITIZE_STRING);
               ?>"/>
           </section>
           <section>
             <label for="format">Remarks:</label>
-            <textarea name="format" id="format" tabindex="2" required
+            <textarea name="format" id="format" tabindex="3" required
               style="height:200px;"><?php echo
                 htmlspecialchars($this->getContext()->format, ENT_HTML5, "UTF-8");
               ?></textarea>
@@ -76,20 +84,20 @@ require("./header.inc.phtml");
             <label for="remarks">Remarks:</label>
             <span style="float:right;">
               <label for="markdown" title="Use markdown or use raw HTML">Markdown</label>
-              <input type="checkbox" name="markdown" id="markdown" tabindex="4"
+              <input type="checkbox" name="markdown" id="markdown" tabindex="5"
                 title="Use markdown or use raw HTML" value="1"<?php
                   if ($this->getContext()->markdown)
                     echo " checked=\"checked\"";
                 ?>/>
             </span>
-            <textarea name="remarks" id="remarks" tabindex="3" required
+            <textarea name="remarks" id="remarks" tabindex="4" required
               style="height:200px;"><?php echo
                 htmlspecialchars($this->getContext()->remarks, ENT_HTML5, "UTF-8");
               ?></textarea>
           </section>
           <section>
-            <input type="submit" name="publish" value="Publish" tabindex="5"/>
-            <input type="submit" name="save" value="Unpublish" tabindex="6"/>
+            <input type="submit" name="publish" value="Publish" tabindex="6"/>
+            <input type="submit" name="save" value="Unpublish" tabindex="7"/>
           </section>
         </form>
 <?php } ?>