X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fhtdocs%2Fluci-static%2Fresources%2Fcbi.js;h=d8719c4b91fbc44e16a4b8aa5f47f635c4547eed;hp=d5355f904bdf50ee97ab5709c8947e386185aff1;hb=c802c941cb5892ac43ee865594d3e06b60c00ace;hpb=70706cf388f8ac100778831e9ef9d7b1eb74c752

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index d5355f904..d8719c4b9 100644
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -2,7 +2,7 @@
 	LuCI - Lua Configuration Interface
 
 	Copyright 2008 Steven Barth <steven@midlink.org>
-	Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+	Copyright 2008-2012 Jo-Philipp Wich <xm@subsignal.org>
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -17,39 +17,52 @@ var cbi_c = [];
 
 var cbi_validators = {
 
-	'integer': function(v)
+	'integer': function()
 	{
-		return (v.match(/^-?[0-9]+$/) != null);
+		return (this.match(/^-?[0-9]+$/) != null);
 	},
 
-	'uinteger': function(v)
+	'uinteger': function()
 	{
-		return (cbi_validators.integer(v) && (v >= 0));
+		return (cbi_validators.integer.apply(this) && (this >= 0));
 	},
 
-	'ipaddr': function(v)
+	'float': function()
 	{
-		return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
+		return !isNaN(parseFloat(this));
 	},
 
-	'ip4addr': function(v)
+	'ufloat': function()
 	{
-		if( v.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?$/) )
+		return (cbi_validators['float'].apply(this) && (this >= 0));
+	},
+
+	'ipaddr': function()
+	{
+		return cbi_validators.ip4addr.apply(this) ||
+			cbi_validators.ip6addr.apply(this);
+	},
+
+	'ip4addr': function()
+	{
+		if (this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
 		{
 			return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
 			       (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
 			       (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
 			       (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
-			       (!RegExp.$5 || ((RegExp.$6 >= 0) && (RegExp.$6 <= 32)))
+			       ((RegExp.$6.indexOf('.') < 0)
+			          ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
+			          : (cbi_validators.ip4addr.apply(RegExp.$6)))
 			;
 		}
 
 		return false;
 	},
 
-	'ip6addr': function(v)
+	'ip6addr': function()
 	{
-		if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
+		if( this.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
 		{
 			if( !RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)) )
 			{
@@ -64,7 +77,7 @@ var cbi_validators = {
 				{
 					var off = addr.lastIndexOf(':');
 
-					if( !(off && cbi_validators.ip4addr(addr.substr(off+1))) )
+					if( !(off && cbi_validators.ip4addr.apply(addr.substr(off+1))) )
 						return false;
 
 					addr = addr.substr(0, off) + ':0:0';
@@ -75,7 +88,7 @@ var cbi_validators = {
 					var colons = 0;
 					var fill = '0';
 
-					for( var i = 0; i < addr.length; i++ )
+					for( var i = 1; i < (addr.length-1); i++ )
 						if( addr.charAt(i) == ':' )
 							colons++;
 
@@ -85,7 +98,9 @@ var cbi_validators = {
 					for( var i = 0; i < (7 - colons); i++ )
 						fill += ':0';
 
-					addr = addr.replace(/::/, ':' + fill + ':');
+					if (addr.match(/^(.*?)::(.*?)$/))
+						addr = (RegExp.$1 ? RegExp.$1 + ':' : '') + fill +
+						       (RegExp.$2 ? ':' + RegExp.$2 : '');
 				}
 
 				return (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null);
@@ -95,55 +110,72 @@ var cbi_validators = {
 		return false;
 	},
 
-	'port': function(v)
+	'port': function()
 	{
-		return cbi_validators.integer(v) && (v >= 0) && (v <= 65535);
+		return cbi_validators.integer.apply(this) &&
+			(this >= 0) && (this <= 65535);
 	},
 
-	'portrange': function(v)
+	'portrange': function()
 	{
-		if( v.match(/^(\d+)-(\d+)$/) )
+		if (this.match(/^(\d+)-(\d+)$/))
 		{
 			var p1 = RegExp.$1;
 			var p2 = RegExp.$2;
 
-			return cbi_validators.port(p1) &&
-			       cbi_validators.port(p2) &&
+			return cbi_validators.port.apply(p1) &&
+			       cbi_validators.port.apply(p2) &&
 			       (parseInt(p1) <= parseInt(p2))
 			;
 		}
 		else
 		{
-			return cbi_validators.port(v);
+			return cbi_validators.port.apply(this);
 		}
 	},
 
-	'macaddr': function(v)
+	'macaddr': function()
+	{
+		return (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null);
+	},
+
+	'host': function()
 	{
-		return (v.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null);
+		return cbi_validators.hostname.apply(this) ||
+			cbi_validators.ipaddr.apply(this);
 	},
 
-	'host': function(v)
+	'hostname': function()
 	{
-		return cbi_validators.hostname(v) || cbi_validators.ipaddr(v);
+		if (this.length <= 253)
+			return (this.match(/^[a-zA-Z0-9]+$/) != null ||
+			        (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
+			         this.match(/[^0-9.]/)));
+
+		return false;
 	},
 
-	'hostname': function(v)
+	'network': function()
 	{
-		return (v.match(/^[a-zA-Z_][a-zA-Z0-9_\-.]*$/) != null);
+		return cbi_validators.uciname.apply(this) ||
+			cbi_validators.host.apply(this);
 	},
 
-	'wpakey': function(v)
+	'wpakey': function()
 	{
+		var v = this;
+
 		if( v.length == 64 )
 			return (v.match(/^[a-fA-F0-9]{64}$/) != null);
 		else
 			return (v.length >= 8) && (v.length <= 63);
 	},
 
-	'wepkey': function(v)
+	'wepkey': function()
 	{
-		if( v.substr(0,2) == 's:' )
+		var v = this;
+
+		if ( v.substr(0,2) == 's:' )
 			v = v.substr(2);
 
 		if( (v.length == 10) || (v.length == 26) )
@@ -152,6 +184,123 @@ var cbi_validators = {
 			return (v.length == 5) || (v.length == 13);
 	},
 
+	'uciname': function()
+	{
+		return (this.match(/^[a-zA-Z0-9_]+$/) != null);
+	},
+
+	'range': function(min, max)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(min) && !isNaN(max) && !isNaN(val))
+			return ((val >= min) && (val <= max));
+
+		return false;
+	},
+
+	'min': function(min)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(min) && !isNaN(val))
+			return (val >= min);
+
+		return false;
+	},
+
+	'max': function(max)
+	{
+		var val = parseFloat(this);
+		if (!isNaN(max) && !isNaN(val))
+			return (val <= max);
+
+		return false;
+	},
+
+	'rangelength': function(min, max)
+	{
+		var val = '' + this;
+		if (!isNaN(min) && !isNaN(max))
+			return ((val.length >= min) && (val.length <= max));
+
+		return false;
+	},
+
+	'minlength': function(min)
+	{
+		var val = '' + this;
+		if (!isNaN(min))
+			return (val.length >= min);
+
+		return false;
+	},
+
+	'maxlength': function(max)
+	{
+		var val = '' + this;
+		if (!isNaN(max))
+			return (val.length <= max);
+
+		return false;
+	},
+
+	'or': function()
+	{
+		for (var i = 0; i < arguments.length; i += 2)
+		{
+			if (typeof arguments[i] != 'function')
+			{
+				if (arguments[i] == this)
+					return true;
+				i--;
+			}
+			else if (arguments[i].apply(this, arguments[i+1]))
+			{
+				return true;
+			}
+		}
+		return false;
+	},
+
+	'and': function()
+	{
+		for (var i = 0; i < arguments.length; i += 2)
+		{
+			if (typeof arguments[i] != 'function')
+			{
+				if (arguments[i] != this)
+					return false;
+				i--;
+			}
+			else if (!arguments[i].apply(this, arguments[i+1]))
+			{
+				return false;
+			}
+		}
+		return true;
+	},
+
+	'neg': function()
+	{
+		return cbi_validators.or.apply(
+			this.replace(/^[ \t]*![ \t]*/, ''), arguments);
+	},
+
+	'list': function(subvalidator, subargs)
+	{
+		if (typeof subvalidator != 'function')
+			return false;
+
+		var tokens = this.match(/[^ \t]+/g);
+		for (var i = 0; i < tokens.length; i++)
+			if (!subvalidator.apply(tokens[i], subargs))
+				return false;
+
+		return true;
+	},
+	'phonedigit': function()
+	{
+		return (this.match(/^[0-9\*#]+$/) != null);
+	}
 };
 
 
@@ -256,7 +405,8 @@ function cbi_d_update() {
 	}
 
 	if (entry && entry.parent) {
-		cbi_t_update();
+		if (!cbi_t_update())
+			cbi_tag_last(parent);
 	}
 
 	if (state) {
@@ -290,17 +440,21 @@ function cbi_combobox(id, values, def, man) {
 
 	var obj = document.getElementById(id)
 	var sel = document.createElement("select");
-	sel.id = selid;
-	sel.className = 'cbi-input-select';
-	if (obj.className && obj.className.match(/cbi-input-invalid/)) {
-		sel.className += ' cbi-input-invalid';
-	}
+		sel.id = selid;
+		sel.className = obj.className.replace(/cbi-input-text/, 'cbi-input-select');
+
 	if (obj.nextSibling) {
 		obj.parentNode.insertBefore(sel, obj.nextSibling);
 	} else {
 		obj.parentNode.appendChild(sel);
 	}
 
+	var dt = obj.getAttribute('cbi_datatype');
+	var op = obj.getAttribute('cbi_optional');
+
+	if (dt)
+		cbi_validate_field(sel, op == 'true', dt);
+
 	if (!values[obj.value]) {
 		if (obj.value == "") {
 			var optdef = document.createElement("option");
@@ -342,10 +496,6 @@ function cbi_combobox(id, values, def, man) {
 			obj.focus();
 		} else {
 			obj.value = sel.options[sel.selectedIndex].value;
-
-			var vld = obj.getAttribute("cbi_validate");
-			sel.className = (!vld || vld())
-				? 'cbi-input-select' : 'cbi-input-select cbi-input-invalid';
 		}
 
 		try {
@@ -354,6 +504,10 @@ function cbi_combobox(id, values, def, man) {
 			//Do nothing
 		}
 	})
+
+	// Retrigger validation in select
+	sel.focus();
+	sel.blur();
 }
 
 function cbi_combobox_init(id, values, def, man) {
@@ -374,18 +528,124 @@ function cbi_filebrowser(id, url, defpath) {
 	browser.focus();
 }
 
-function cbi_dynlist_init(name)
+function cbi_browser_init(id, respath, url, defpath)
+{
+	function cbi_browser_btnclick(e) {
+		cbi_filebrowser(id, url, defpath);
+		return false;
+	}
+
+	var field = document.getElementById(id);
+
+	var btn = document.createElement('img');
+	btn.className = 'cbi-image-button';
+	btn.src = respath + '/cbi/folder.gif';
+	field.parentNode.insertBefore(btn, field.nextSibling);
+
+	cbi_bind(btn, 'click', cbi_browser_btnclick);
+}
+
+function cbi_dynlist_init(name, respath, datatype, optional, choices)
 {
-	function cbi_dynlist_renumber(e)
+	var input0 = document.getElementsByName(name)[0];
+	var prefix = input0.name;
+	var parent = input0.parentNode;
+	var holder = input0.placeholder;
+
+	var values;
+
+	function cbi_dynlist_redraw(focus, add, del)
 	{
-		var count = 1;
-		var childs = e.parentNode.childNodes;
+		values = [ ];
+
+		while (parent.firstChild)
+		{
+			var n = parent.firstChild;
+			var i = parseInt(n.index);
+
+			if (i != del)
+			{
+				if (n.nodeName.toLowerCase() == 'input')
+					values.push(n.value || '');
+				else if (n.nodeName.toLowerCase() == 'select')
+					values[values.length-1] = n.options[n.selectedIndex].value;
+			}
+
+			parent.removeChild(n);
+		}
 
-		for( var i = 0; i < childs.length; i++ )
-			if( childs[i].name == name )
-				childs[i].id = name + '.' + (count++);
+		if (add >= 0)
+		{
+			focus = add+1;
+			values.splice(focus, 0, '');
+		}
+		else if (values.length == 0)
+		{
+			focus = 0;
+			values.push('');
+		}
 
-		e.focus();
+		for (var i = 0; i < values.length; i++)
+		{
+			var t = document.createElement('input');
+				t.id = prefix + '.' + (i+1);
+				t.name = prefix;
+				t.value = values[i];
+				t.type = 'text';
+				t.index = i;
+				t.className = 'cbi-input-text';
+
+			if (i == 0 && holder)
+			{
+				t.placeholder = holder;
+			}
+
+			var b = document.createElement('img');
+				b.src = respath + ((i+1) < values.length ? '/cbi/remove.gif' : '/cbi/add.gif');
+				b.className = 'cbi-image-button';
+
+			parent.appendChild(t);
+			parent.appendChild(b);
+			parent.appendChild(document.createElement('br'));
+
+			if (datatype)
+			{
+				cbi_validate_field(t.id, ((i+1) == values.length) || optional, datatype);
+			}
+
+			if (choices)
+			{
+				cbi_combobox_init(t.id, choices[0], '', choices[1]);
+				t.nextSibling.index = i;
+
+				cbi_bind(t.nextSibling, 'keydown',  cbi_dynlist_keydown);
+				cbi_bind(t.nextSibling, 'keypress', cbi_dynlist_keypress);
+
+				if (i == focus || -i == focus)
+					t.nextSibling.focus();
+			}
+			else
+			{
+				cbi_bind(t, 'keydown',  cbi_dynlist_keydown);
+				cbi_bind(t, 'keypress', cbi_dynlist_keypress);
+
+				if (i == focus)
+				{
+					t.focus();
+				}
+				else if (-i == focus)
+				{
+					t.focus();
+
+					/* force cursor to end */
+					var v = t.value;
+					t.value = ' '
+					t.value = v;
+				}
+			}
+
+			cbi_bind(b, 'click', cbi_dynlist_btnclick);
+		}
 	}
 
 	function cbi_dynlist_keypress(ev)
@@ -442,24 +702,29 @@ function cbi_dynlist_init(name)
 		while (next && next.name != name)
 			next = next.nextSibling;
 
+		/* advance one further in combobox case */
+		if (next && next.nextSibling.name == name)
+			next = next.nextSibling;
+
 		switch (ev.keyCode)
 		{
 			/* backspace, delete */
 			case 8:
 			case 46:
-				var jump = (ev.keyCode == 8)
-					? (prev || next) : (next || prev);
+				var del = (se.nodeName.toLowerCase() == 'select')
+					? true : (se.value.length == 0);
 
-				if (se.value.length == 0 && jump)
+				if (del)
 				{
-					se.parentNode.removeChild(se.nextSibling);
-					se.parentNode.removeChild(se);
-
-					cbi_dynlist_renumber(jump);
-
 					if (ev.preventDefault)
 						ev.preventDefault();
 
+					var focus = se.index;
+					if (ev.keyCode == 8)
+						focus = -focus+1;
+
+					cbi_dynlist_redraw(focus, -1, se.index);
+
 					return false;
 				}
 
@@ -467,31 +732,7 @@ function cbi_dynlist_init(name)
 
 			/* enter */
 			case 13:
-				var n = document.createElement('input');
-					n.name       = se.name;
-					n.type       = se.type;
-
-				cbi_bind(n, 'keydown',  cbi_dynlist_keydown);
-				cbi_bind(n, 'keypress', cbi_dynlist_keypress);
-
-				if (next)
-				{
-					se.parentNode.insertBefore(n, next);
-					se.parentNode.insertBefore(document.createElement('br'), next);
-				}
-				else
-				{
-					se.parentNode.appendChild(n);
-					se.parentNode.appendChild(document.createElement('br'));
-				}
-
-				var dt = se.getAttribute('cbi_datatype');
-				var op = se.getAttribute('cbi_optional') == 'true';
-
-				if (dt)
-					cbi_validate_field(n, op, dt);
-
-				cbi_dynlist_renumber(n);
+				cbi_dynlist_redraw(-1, se.index, -1);
 				break;
 
 			/* arrow up */
@@ -512,12 +753,33 @@ function cbi_dynlist_init(name)
 		return true;
 	}
 
-	var inputs = document.getElementsByName(name);
-	for( var i = 0; i < inputs.length; i++ )
+	function cbi_dynlist_btnclick(ev)
 	{
-		cbi_bind(inputs[i], 'keydown',  cbi_dynlist_keydown);
-		cbi_bind(inputs[i], 'keypress', cbi_dynlist_keypress);
+		ev = ev ? ev : window.event;
+
+		var se = ev.target ? ev.target : ev.srcElement;
+
+		if (se.src.indexOf('remove') > -1)
+		{
+			se.previousSibling.value = '';
+
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 8
+			});
+		}
+		else
+		{
+			cbi_dynlist_keydown({
+				target:  se.previousSibling,
+				keyCode: 13
+			});
+		}
+
+		return false;
 	}
+
+	cbi_dynlist_redraw(NaN, -1, -1);
 }
 
 //Hijacks the CBI form to send via XHR (requires Prototype)
@@ -574,9 +836,11 @@ function cbi_t_switch(section, tab) {
 
 function cbi_t_update() {
 	var hl_tabs = [ ];
+	var updated = false;
 
 	for( var sid in cbi_t )
 		for( var tid in cbi_t[sid] )
+		{
 			if( cbi_c[cbi_t[sid][tid].cid] == 0 ) {
 				cbi_t[sid][tid].tab.style.display = 'none';
 			}
@@ -588,11 +852,17 @@ function cbi_t_update() {
 				hl_tabs.push(t);
 			}
 
+			cbi_tag_last(cbi_t[sid][tid].container);
+			updated = true;
+		}
+
 	if( hl_tabs.length > 0 )
 		window.setTimeout(function() {
 			for( var i = 0; i < hl_tabs.length; i++ )
 				hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');
 		}, 750);
+
+	return updated;
 }
 
 
@@ -627,12 +897,87 @@ function cbi_validate_reset(form)
 	return true;
 }
 
+function cbi_validate_compile(code)
+{
+	var pos = 0;
+	var esc = false;
+	var depth = 0;
+	var stack = [ ];
+
+	code += ',';
+
+	for (var i = 0; i < code.length; i++)
+	{
+		if (esc)
+		{
+			esc = false;
+			continue;
+		}
+
+		switch (code.charCodeAt(i))
+		{
+		case 92:
+			esc = true;
+			break;
+
+		case 40:
+		case 44:
+			if (depth <= 0)
+			{
+				if (pos < i)
+				{
+					var label = code.substring(pos, i);
+						label = label.replace(/\\(.)/g, '$1');
+						label = label.replace(/^[ \t]+/g, '');
+						label = label.replace(/[ \t]+$/g, '');
+
+					if (label && !isNaN(label))
+					{
+						stack.push(parseFloat(label));
+					}
+					else if (label.match(/^(['"]).*\1$/))
+					{
+						stack.push(label.replace(/^(['"])(.*)\1$/, '$2'));
+					}
+					else if (typeof cbi_validators[label] == 'function')
+					{
+						stack.push(cbi_validators[label]);
+						stack.push(null);
+					}
+					else
+					{
+						throw "Syntax error, unhandled token '"+label+"'";
+					}
+				}
+				pos = i+1;
+			}
+			depth += (code.charCodeAt(i) == 40);
+			break;
+
+		case 41:
+			if (--depth <= 0)
+			{
+				if (typeof stack[stack.length-2] != 'function')
+					throw "Syntax error, argument list follows non-function";
+
+				stack[stack.length-1] =
+					arguments.callee(code.substring(pos, i));
+
+				pos = i+1;
+			}
+			break;
+		}
+	}
+
+	return stack;
+}
+
 function cbi_validate_field(cbid, optional, type)
 {
 	var field = (typeof cbid == "string") ? document.getElementById(cbid) : cbid;
-	var vldcb = cbi_validators[type];
+	var vstack; try { vstack = cbi_validate_compile(type); } catch(e) { };
 
-	if( field && vldcb )
+	if (field && vstack && typeof vstack[0] == "function")
 	{
 		var validator = function()
 		{
@@ -642,8 +987,10 @@ function cbi_validate_field(cbid, optional, type)
 				field.className = field.className.replace(/ cbi-input-invalid/g, '');
 
 				// validate value
-				var value = (field.options) ? field.options[field.options.selectedIndex].value : field.value;
-				if( !(((value.length == 0) && optional) || vldcb(value)) )
+				var value = (field.options && field.options.selectedIndex > -1)
+					? field.options[field.options.selectedIndex].value : field.value;
+
+				if (!(((value.length == 0) && optional) || vstack[0].apply(value, vstack[1])))
 				{
 					// invalid
 					field.className += ' cbi-input-invalid';
@@ -662,11 +1009,91 @@ function cbi_validate_field(cbid, optional, type)
 		cbi_bind(field, "blur",  validator);
 		cbi_bind(field, "keyup", validator);
 
+		if (field.nodeName == 'SELECT')
+		{
+			cbi_bind(field, "change", validator);
+			cbi_bind(field, "click",  validator);
+		}
+
 		field.setAttribute("cbi_validate", validator);
 		field.setAttribute("cbi_datatype", type);
 		field.setAttribute("cbi_optional", (!!optional).toString());
 
 		validator();
+
+		var fcbox = document.getElementById('cbi.combobox.' + field.id);
+		if (fcbox)
+			cbi_validate_field(fcbox, optional, type);
+	}
+}
+
+function cbi_row_swap(elem, up, store)
+{
+	var tr = elem.parentNode;
+	while (tr && tr.nodeName.toLowerCase() != 'tr')
+		tr = tr.parentNode;
+
+	if (!tr)
+		return false;
+
+	var table = tr.parentNode;
+	while (table && table.nodeName.toLowerCase() != 'table')
+		table = table.parentNode;
+
+	if (!table)
+		return false;
+
+	var s = up ? 3 : 2;
+	var e = up ? table.rows.length : table.rows.length - 1;
+
+	for (var idx = s; idx < e; idx++)
+	{
+		if (table.rows[idx] == tr)
+		{
+			if (up)
+				tr.parentNode.insertBefore(table.rows[idx], table.rows[idx-1]);
+			else
+				tr.parentNode.insertBefore(table.rows[idx+1], table.rows[idx]);
+
+			break;
+		}
+	}
+
+	var ids = [ ];
+	for (idx = 2; idx < table.rows.length; idx++)
+	{
+		table.rows[idx].className = table.rows[idx].className.replace(
+			/cbi-rowstyle-[12]/, 'cbi-rowstyle-' + (1 + (idx % 2))
+		);
+
+		if (table.rows[idx].id && table.rows[idx].id.match(/-([^\-]+)$/) )
+			ids.push(RegExp.$1);
+	}
+
+	var input = document.getElementById(store);
+	if (input)
+		input.value = ids.join(' ');
+
+	return false;
+}
+
+function cbi_tag_last(container)
+{
+	var last;
+
+	for (var i = 0; i < container.childNodes.length; i++)
+	{
+		var c = container.childNodes[i];
+		if (c.nodeType == 1 && c.nodeName.toLowerCase() == 'div')
+		{
+			c.className = c.className.replace(/ cbi-value-last$/, '');
+			last = c;
+		}
+	}
+
+	if (last)
+	{
+		last.className += ' cbi-value-last';
 	}
 }
 
@@ -740,7 +1167,7 @@ if( ! String.format )
 
 		var str = arguments[0];
 		var out = '';
-		var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j))/;
+		var re = /^(([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X|q|h|j|t|m))/;
 		var a = b = [], numSubstitutions = 0, numMatches = 0;
 
 		while( a = re.exec(str) )
@@ -801,7 +1228,7 @@ if( ! String.format )
 
 						case 'f':
 							subst = (precision > -1)
-								? Math.round((parseFloat(param) || 0.0) * Math.pow(10, precision)) / Math.pow(10, precision)
+								? ((parseFloat(param) || 0.0)).toFixed(precision)
 								: (parseFloat(param) || 0.0);
 							break;
 
@@ -832,6 +1259,47 @@ if( ! String.format )
 						case 'j':
 							subst = String.serialize(param);
 							break;
+
+						case 't':
+							var td = 0;
+							var th = 0;
+							var tm = 0;
+							var ts = (param || 0);
+
+							if (ts > 60) {
+								tm = Math.floor(ts / 60);
+								ts = (ts % 60);
+							}
+
+							if (tm > 60) {
+								th = Math.floor(tm / 60);
+								tm = (tm % 60);
+							}
+
+							if (th > 24) {
+								td = Math.floor(th / 24);
+								th = (th % 24);
+							}
+
+							subst = (td > 0)
+								? String.format('%dd %dh %dm %ds', td, th, tm, ts)
+								: String.format('%dh %dm %ds', th, tm, ts);
+
+							break;
+
+						case 'm':
+							var mf = pMinLength ? parseInt(pMinLength) : 1000;
+							var pr = pPrecision ? Math.floor(10*parseFloat('0'+pPrecision)) : 2;
+
+							var i = 0;
+							var val = parseFloat(param || 0);
+							var units = [ '', 'K', 'M', 'G', 'T', 'P', 'E' ];
+
+							for (i = 0; (i < units.length) && (val > mf); i++)
+								val /= mf;
+
+							subst = val.toFixed(pr) + ' ' + units[i];
+							break;
 					}
 				}
 			}