luci-base: add hostport and ipaddrport validation types

Add two new types 'hostport' and 'ipaddrport' to validate strings in the form
'sub.example.org:1234' and '0.0.0.0:80'. The 'hostport' accepts hostnames or
IP addresses followed by a colon and a port number while the 'ipaddrport' type
accepts numeric IP addresses only, followed by a colon and a port.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 02c54ad3e8..8a3cb6fca7 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -161,6 +161,28 @@ var cbi_validators = {
 			cbi_validators.host.apply(this);
 	},
 
+	'hostport': function()
+	{
+		var hp = this.split(/:/);
+
+		if (hp.length == 2)
+			return (cbi_validators.host.apply(hp[0]) &&
+			        cbi_validators.port.apply(hp[1]));
+
+		return false;
+	},
+
+	'ipaddrport': function()
+	{
+		var hp = this.split(/:/);
+
+		if (hp.length == 2)
+			return (cbi_validators.ipaddr.apply(hp[0]) &&
+			        cbi_validators.port.apply(hp[1]));
+
+		return false;
+	},
+
 	'wpakey': function()
 	{
 		var v = this;