From 5892a176a3a31c1bb072a0851855a016b22654d1 Mon Sep 17 00:00:00 2001
From: That-Guy <raptors@that-guy.net>
Date: Sat, 21 Apr 2012 17:18:51 +0200
Subject: [PATCH] lsp protocol interface fix for 23 (#17)

---
 server.html | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/server.html b/server.html
index d91a86d6..69b377f4 100644
--- a/server.html
+++ b/server.html
@@ -561,17 +561,7 @@ td
             {
                var ret = $.extend(true,
                {
-                  "config":
-                  {
-                     "host": "",
-                     "limits": [],
-                     "name": "",
-                     "protocols": {},
-                     "status": "",
-                     "version": ""
-                  },
                   "streams": {},
-                  "log": {},
                   "statistics": {}
                }, d);
 
@@ -672,7 +662,7 @@ td
                         "host": "",
                         "limits": [],
                         "name": "",
-                        "protocols": {},
+                        "protocols": [],
                         "status": "",
                         "version": ""
                      },
@@ -891,7 +881,7 @@ td
                   {
                     if(confirmDelete('Are you sure you want to force a JSON save?') == true)
                     {
-                       console.log('magie hier!');   // TODO FIXME
+                       console.log('magie hier!');   // TODO FIXME JARON
                     }
                   }).text( 'force save to JSON file' )
                );
@@ -911,26 +901,30 @@ td
                $table.html("<thead><th>Protocol</th><th>Port</th><th>Interface</th><th></th></thead>");
                $tbody = $('<tbody>');
 
-               var tr, protocol;
+               var tr, i, protocol,
+                   len = settings.settings.config.protocols.length;
 
                // remove old stuff
                $tbody.html('');
 
-               for(protocol in settings.settings.config.protocols)
+               for(i = 0; i < len; i++)
                {
-                  tr = $('<tr>').attr('id', 'protocol-' + protocol);
+                  protocol = settings.settings.config.protocols[i];  // local copy, {}
 
-                  tr.append( $('<td>').text( protocol ) );
-                  tr.append( $('<td>').text( settings.settings.config.protocols[protocol].port ) );
+                  tr = $('<tr>').attr('id', 'protocol-' + i);
 
-                  tr.append( $('<td>').text( '_' ) );  // interface
+                  tr.append( $('<td>').text( protocol.connector ) );
+                  tr.append( $('<td>').text( protocol.port ) );
+
+                  tr.append( $('<td>').text( protocol['interface'] ) );  // interface is a reserved JS keyword :)
 
                   tr.append( $('<td>').attr('class', 'center').append( $('<button>').click(function()
                              {
                                 if(confirmDelete('Are you sure you want to delete this protocol?') == true)
                                 {
                                    var id = $(this).parent().parent().attr('id').replace('protocol-', '');
-                                   delete settings.settings.config.protocols[protocol];
+                                   settings.settings.config.protocols.splice(i, 1);
+                                   //delete settings.settings.config.protocols[protocol];
                                    $(this).parent().parent().remove();
                                    loadSettings();
                                 }
@@ -966,13 +960,26 @@ td
 
                         if(!settings.settings.config.protocols)
                         {
-                           settings.settings.config.protocols = {};
+                           //settings.settings.config.protocols = {};
+                           settings.settings.config.protocols = [];
                         }
 
+                        /*
                         settings.settings.config.protocols[$('#new-protocol-name :selected').val()] =
                         {
                            port: $('#new-protocol-val').val()
                         };
+                        */
+
+                        var nobj =
+                        {
+                           connector: $('#new-protocol-name :selected').val(),
+                           port: $('#new-protocol-val').val(),
+                        };
+
+                        nobj['interface'] = $('#new-protocol-interface').val();
+
+                        settings.settings.config.protocols.push(nobj);
 
                         loadSettings(function()
                         {