From f12d4fa770807404839d0a277b63f6b6977d961b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 26 Jun 2020 14:53:15 +0200
Subject: [PATCH] Add help on omr-bypass for interfaces

---
 .../resources/view/services/omr-bypass.js     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index e6765f9ea..bc9ae76e3 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -30,7 +30,7 @@ return L.view.extend({
 		o = s.option(form.Value, 'name', _('Domain'));
 		o.rmempty = false;
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -67,7 +67,7 @@ return L.view.extend({
 		o.value('udp');
 		o.value('icmp');
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -89,7 +89,7 @@ return L.view.extend({
 		o.value('udp');
 		o.value('icmp');
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -109,7 +109,7 @@ return L.view.extend({
 			o.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
 		});
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -131,7 +131,7 @@ return L.view.extend({
 			}
 		});
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -146,7 +146,7 @@ return L.view.extend({
 		o = s.option(form.Value, 'asn', _('ASN'));
 		o.rmempty = false;
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
@@ -162,8 +162,8 @@ return L.view.extend({
 		o.rmempty = false;
 		o.load = function(section_id) {
 			return Promise.all([
-				fs.lines('/proc/net/xt_ndpi/proto'),
-				fs.lines('/proc/net/xt_ndpi/host_proto')
+				fs.read_direct('/proc/net/xt_ndpi/proto'),
+				fs.read_direct('/proc/net/xt_ndpi/host_proto')
 			]).then(L.bind(function(linesi) {
 				var proto = linesi[0],
 				    host = linesi[1],
@@ -178,7 +178,7 @@ return L.view.extend({
 					if (m && m[0] != "#Proto")
 					  name.push(m[0]);
 				}
-				name = Array.from(new Set(name)).sort();
+				name = Array.from(new Set(name)).sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); });
 				for (var i = 0; i < name.length; i++) {
 					this.value(name[i]);
 				}
@@ -186,7 +186,7 @@ return L.view.extend({
 			},this));
 		};
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;