From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 7 Dec 2017 13:03:54 +0000 (+0100)
Subject: Merge pull request #1452 from mkresin/master
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a41215581d916d2716d6ffb2428a0cfd83bb4e92;hp=0a2c7b9e5c1745e28451825c838fc38752bebf60

Merge pull request #1452 from mkresin/master

fix DHCPv6 hostname display
---

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 4bb404c25..f6914ceda 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -98,10 +98,9 @@ o3.rmempty = false
 
 -- Runtime information
 
-ds = s:option(DummyValue, "", translate("Runtime Information"))
-ds.template = "cbi/nullsection"
+ds = m:section(NamedSection, "global", "adblock", translate("Runtime Information"))
 
-dv1 = s:option(DummyValue, "", translate("Adblock Status"))
+dv1 = ds:option(DummyValue, "", translate("Adblock Status"))
 dv1.template = "adblock/runtime"
 if parse == nil then
 	dv1.value = translate("n/a")
@@ -117,7 +116,7 @@ else
 	end
 end
 
-dv2 = s:option(DummyValue, "", translate("Adblock Version"))
+dv2 = ds:option(DummyValue, "", translate("Adblock Version"))
 dv2.template = "adblock/runtime"
 if parse == nil then
 	dv2.value = translate("n/a")
@@ -125,7 +124,7 @@ else
 	dv2.value = version
 end
 
-dv3 = s:option(DummyValue, "", translate("Download Utility (SSL Library)"),
+dv3 = ds:option(DummyValue, "", translate("Download Utility (SSL Library)"),
 	translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or the wget 'built-in'."))
 dv3.template = "adblock/runtime"
 if parse == nil then
@@ -134,7 +133,7 @@ else
 	dv3.value = fetch
 end
 
-dv4 = s:option(DummyValue, "", translate("DNS Backend (DNS Directory)"))
+dv4 = ds:option(DummyValue, "", translate("DNS Backend (DNS Directory)"))
 dv4.template = "adblock/runtime"
 if parse == nil then
 	dv4.value = translate("n/a")
@@ -142,7 +141,7 @@ else
 	dv4.value = backend
 end
 
-dv5 = s:option(DummyValue, "", translate("Overall Domains"))
+dv5 = ds:option(DummyValue, "", translate("Overall Domains"))
 dv5.template = "adblock/runtime"
 if parse == nil then
 	dv5.value = translate("n/a")
@@ -150,7 +149,7 @@ else
 	dv5.value = domains
 end
 
-dv6 = s:option(DummyValue, "", translate("Last Run"))
+dv6 = ds:option(DummyValue, "", translate("Last Run"))
 dv6.template = "adblock/runtime"
 if parse == nil then
 	dv6.value = translate("n/a")
diff --git a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
index 847ad5cfb..4ea67ce70 100644
--- a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
+++ b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
@@ -71,15 +71,14 @@
     end
 
     apply_acls("/usr/share/rpcd/acl.d/attendedsysupgrade.json", luci.dispatcher.context.authsession)
-    apply_acls("/usr/share/rpcd/acl.d/packagelist.json", luci.dispatcher.context.authsession)
 %>
 <%+header%>
 <h2 name="content"><%:Attended Sysupgrade%></h2>
 <div class="cbi-map-descr">
-	Easily search and install new releases and package upgrades. Sysupgrade images are created on demand based on locally installed packages.
+	Easily search and install new releases and package upgrades. Sysupgrade firmware are created on demand based on locally installed packages.
 </div>
-<div style="display: none" id="upgrade_info" class="alert-message info"></div>
-<div style="display: none" id="upgrade_error" class="alert-message danger"></div>
+<div style="display: none" id="info_box" class="alert-message info"></div>
+<div style="display: none" id="error_box" class="alert-message danger"></div>
 <div style="display: none" id="packages" class="alert-message success"></div>
 <p>
 <textarea style="display: none; width: 100%;" id="edit_packages" rows="15"></textarea>
@@ -89,7 +88,7 @@
 		<div class="cbi-selection-node">
 			<div class="cbi-value" id="keep_container" style="display: none">
 				<div class="cbi-section-descr">
-					Check "Keep settings" to retain the current configuration (requires a compatible firmware image).
+					Check "Keep settings" to retain the current configuration (requires a compatible firmware).
 				</div>
 				<label class="cbi-value-title" for="keep">Keep settings:</label>
 				<div class="cbi-value-field">
@@ -121,14 +120,15 @@ origin = document.location.href.replace(location.pathname, "")
 ubus_url = origin + "/ubus/"
 
 function set_server() {
+	document.getElementById("error_box").style.display = "none";
 	data.url = document.getElementById("server").value;
 	ubus_call("uci", "set", { "config": "attendedsysupgrade", "section": "server", values: { "url": data.url } })
 	ubus_call("uci", "commit", { "config": "attendedsysupgrade" })
-	var server = document.getElementById("server")
-	server.type = 'button';
-	server.className = 'cbi-button cbi-button-edit';
-	server.parentElement.removeChild(document.getElementById("button_set"));
-	server.onclick = edit_server;
+	var server_button = document.getElementById("server")
+	server_button.type = 'button';
+	server_button.className = 'cbi-button cbi-button-edit';
+	server_button.parentElement.removeChild(document.getElementById("button_set"));
+	server_button.onclick = edit_server;
 }
 
 function edit_server() {
@@ -170,7 +170,7 @@ function server_request(request_dict, path, callback) {
 	request.setRequestHeader("Content-type", "application/json");
 	request.send(JSON.stringify(request_dict));
 	request.onerror = function(e) {
-		upgrade_error("upgrade server down")
+		error_box("upgrade server down")
 		document.getElementById("server_div").style.display = "block";
 	}
 	request.addEventListener('load', function(event) {
@@ -181,18 +181,20 @@ function server_request(request_dict, path, callback) {
 // initial setup, get system information
 function setup() {
 	data["ubus_rpc_session"] = "<%=luci.dispatcher.context.authsession%>"
-	ubus_call("packagelist", "list", {}, "packagelist");
+	ubus_call("rpc-sys", "packagelist", {}, "packages");
 	ubus_call("system", "board", {}, "release");
 	ubus_call("system", "board", {}, "board_name");
 	ubus_call("system", "board", {}, "model");
-	uci_call({ "config": "attendedsysupgrade", "section": "server", "option": "url" })
-	uci_call({ "config": "attendedsysupgrade", "section": "client", "option": "upgrade_packages" })
-	uci_call({ "config": "attendedsysupgrade", "section": "client", "option": "advanced_mode" })
-	uci_call({ "config": "attendedsysupgrade", "section": "client", "option": "auto_search" })
+	ubus_call("system", "info", {}, "memory");
+	uci_get({ "config": "attendedsysupgrade", "section": "server", "option": "url" })
+	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "upgrade_packages" })
+	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "advanced_mode" })
+	uci_get({ "config": "attendedsysupgrade", "section": "client", "option": "auto_search" })
 	setup_ready();
 }
 
 function setup_ready() {
+	// checks if a async ubus calls have finished
 	if(ubus_counter != ubus_closed) {
 		setTimeout(setup_ready, 300)
 	} else {
@@ -206,14 +208,15 @@ function setup_ready() {
 	}
 }
 
-function uci_call(option) {
+function uci_get(option) {
+	// simple wrapper to get a uci value store in data.<option>
 	ubus_call("uci", "get", option, option["option"])
 }
 
 ubus_counter = 0;
 ubus_closed = 0;
 function ubus_call(command, argument, params, variable) {
-	request_data = {};
+	var request_data = {};
 	request_data.jsonrpc = "2.0";
 	request_data.id = ubus_counter;
 	request_data.method = "call";
@@ -223,130 +226,169 @@ function ubus_call(command, argument, params, variable) {
 	var request = new XMLHttpRequest();
 	request.open("POST", ubus_url, true);
 	request.setRequestHeader("Content-type", "application/json");
-	request.addEventListener('load', function(event) {
+	request.onload = function(event) {
 		if(request.status === 200) {
-			response = JSON.parse(request.responseText).result
-			if(response[0] == 0) {
-				if(response.length == 2) {
+			var response = JSON.parse(request.responseText)
+			if(!("error" in response) && "result" in response) {
+				if(response.result.length === 2) {
 					if(command === "uci") {
-						data[variable] = response[1].value
+						data[variable] = response.result[1].value
 					} else {
-						data[variable] = response[1][variable]
+						data[variable] = response.result[1][variable]
 					}
 				}
 			} else {
-				upgrade_error("ubus call faild: " + request_json)
+				error_box("<b>Ubus call faild:</b></br>Request: " + request_json + "</br>Response: " + JSON.stringify(response))
 			}
 			ubus_closed++;
 		}
-	});
+	}
 	request.send(request_json);
 }
 
-// shows notification if upgrade is available
-function upgrade_info(info_output, loading) {
-	document.getElementById("upgrade_info").style.display = "block";
+function info_box(info_output, loading) {
+	// Shows notification if upgrade is available
+	// If loading is true then an "processing" animation is added
+	document.getElementById("info_box").style.display = "block";
+	var loading_image = '';
 	if(loading) {
-		loading_image = '<img src="/luci-static/resources/icons/loading.gif" alt="Loading" style="vertical-align:middle">'
-	} else {
-		loading_image = ''
+		loading_image = '<img src="/luci-static/resources/icons/loading.gif" alt="Loading" style="vertical-align:middle">';
 	}
-	document.getElementById("upgrade_info").innerHTML = loading_image + info_output;
+	document.getElementById("info_box").innerHTML = loading_image + info_output;
 }
 
-function upgrade_error(error_output) {
-	document.getElementById("upgrade_error").style.display = "block";
-	document.getElementById("upgrade_error").innerHTML = error_output;
-	document.getElementById("upgrade_info").style.display = "none";
+function error_box(error_output) {
+	// Shows erros in red box
+	document.getElementById("error_box").style.display = "block";
+	document.getElementById("error_box").innerHTML = error_output;
+	document.getElementById("info_box").style.display = "none";
 }
 
-// asks server for news upgrades, actually only based on relesae not packages
 function upgrade_check() {
-	document.getElementById("upgrade_error").style.display = "none";
+	// Asks server for new firmware
+	// If data.upgrade_packages is set to true search for new package versions as well
+	document.getElementById("error_box").style.display = "none";
 	document.getElementById("server_div").style.display = "none";
-	upgrade_info("Searching for upgrades", true);
-	request_dict = {}
+	info_box("Searching for upgrades", true);
+	var request_dict = {}
 	request_dict.version = data.release.version;
-	request_dict.packages = data.packagelist;
-	// not only search for new release, but for new package versions as well
+	request_dict.packages = data.packages;
 	request_dict.upgrade_packages = data.upgrade_packages
 	server_request(request_dict, "api/upgrade-check", upgrade_check_callback)
 }
 
-// request the image, need merge with upgrade_request
+function upgrade_check_callback(request_text) {
+	var request_json = JSON.parse(request_text)
+
+	// create simple output to tell user whats going to be upgrade (release/packages)
+	var info_output = ""
+	if(request_json.version != undefined) {
+		info_output += "<h3>New firmware release available</h3>"
+		info_output += data.release.version + " to " + request_json.version
+		data.latest_version = request_json.version;
+	}
+	if(request_json.upgrades != undefined) {
+		info_output += "<h3>Package upgrades available</h3>"
+		for (upgrade in request_json.upgrades) {
+			info_output += "<b>" + upgrade + "</b>: " + request_json.upgrades[upgrade][1] + " to " + request_json.upgrades[upgrade][0] + "</br>"
+		}
+	}
+	data.packages = request_json.packages
+	info_box(info_output)
+
+	if(data.advanced_mode == 1) {
+		document.getElementById("edit_button").style.display = "block";
+	}
+	var upgrade_button = document.getElementById("upgrade_button")
+	upgrade_button.value = "Request firmware";
+	upgrade_button.style.display = "block";
+	upgrade_button.disabled = false;
+	upgrade_button.onclick = upgrade_request;
+
+}
+
 function upgrade_request() {
-	console.log("upgrade_request")
+	// Request the image
+	// Needed values
+	// version/release
+	// board_name or model (server tries to find the corrent profile)
+	// packages
+	// The rest is added by server_request()
 	document.getElementById("upgrade_button").disabled = true;
 	document.getElementById("edit_packages").style.display = "none";
 	document.getElementById("edit_button").style.display = "none";
 	document.getElementById("keep_container").style.display = "none";
-	request_dict = {}
+
+	var request_dict = {}
 	request_dict.version = data.latest_version;
 	request_dict.board = data.board_name
+	request_dict.model = data.model
 
 	if(data.edit_packages == true) {
 		request_dict.packages = document.getElementById("edit_packages").value.split("\n")
 	} else {
 		request_dict.packages = data.packages;
 	}
-	request_dict.model = data.model
+
 	server_request(request_dict, "api/upgrade-request", upgrade_request_callback)
 }
 
-function upgrade_request_callback(response) {
-	if (response.status === 400) {
-		response_content = JSON.parse(response.responseText)
-		upgrade_error(response_content.error)
-	} else if (response.status === 500) {
-		response_content = JSON.parse(response.responseText)
-		upgrade_error(response_content.error)
-		if(response_content.log != undefined) {
-			data.log_url = response_content.log
-		}
-	} else if (response.status === 503) {
-		upgrade_error("please wait. server overloaded")
-		// handle overload
-		setTimeout(upgrade_request, 30000)
-	} else if (response.status === 201) {
-		response_content = JSON.parse(response.responseText)
-		if(response_content.queue != undefined) {
-			// in queue
-			upgrade_info("please wait. you are in queue position " + response_content.queue, true)
-			console.log("queued")
-		} else {
-			upgrade_info("imagebuilder not ready, please wait", true)
-			console.log("setting up imagebuilder")
-		}
-		setTimeout(upgrade_request, 5000)
-	} else if (response.status === 206) {
-		// building
-		console.log("building")
-		upgrade_info("building image", true)
-		setTimeout(upgrade_request, 5000)
-	} else if (response.status === 200) {
-		// ready to download
-		response_content = JSON.parse(response.responseText);
-		data.sysupgrade_url = response_content.sysupgrade;
-
-		info_output = "Image created"
-		if(data.advanced_mode == 1) {
-			build_log = '</br><a target="_blank" href="' + data.sysupgrade_url + '.log">Build log</a>'
-			info_output += build_log
-		}
-		upgrade_info(info_output);
-
-		document.getElementById("keep_container").style.display = "block";
-		var upgrade_button = document.getElementById("upgrade_button")
-		upgrade_button.disabled = false;
-		upgrade_button.style.display = "block";
-		upgrade_button.value = "Flash firmware";
-		upgrade_button.onclick = download_image;
+function upgrade_request_callback(request) {
+	// ready to download
+	var request_json = JSON.parse(request);
+	data.sysupgrade_url = request_json.sysupgrade;
+	data.checksum = request_json.checksum;
+	data.filesize = request_json.filesize;
+
+	info_output = "Firmware created"
+	if(data.advanced_mode == 1) {
+		info_output += '</br><a target="_blank" href="' + data.sysupgrade_url + '.log">Build log</a>'
+	}
+	info_box(info_output);
+
+	document.getElementById("keep_container").style.display = "block";
+	var upgrade_button = document.getElementById("upgrade_button")
+	upgrade_button.disabled = false;
+	upgrade_button.style.display = "block";
+	upgrade_button.value = "Flash firmware";
+	upgrade_button.onclick = download_image;
+}
+
+function flash_image() {
+	// Flash image via rpc-sys upgrade_start
+	info_box("Flashing firmware. Don't unpower device", true)
+	ubus_call("rpc-sys", "upgrade_start", { "keep": document.getElementById("keep").checked }, 'message');
+	ping_max = 3600; // in seconds
+	setTimeout(ping_ubus, 10000)
+}
+
+function ping_ubus() {
+	// Tries to connect to ubus. If the connection fails the device is likely still rebooting.
+	// If more time than ping_max passes update may failed
+	if(ping_max > 0) {
+		ping_max--;
+		var request = new XMLHttpRequest();
+		request.open("GET", ubus_url, true);
+		request.addEventListener('error', function(event) {
+			info_box("Rebooting device", true);
+			setTimeout(ping_ubus, 1000)
+		});
+		request.addEventListener('load', function(event) {
+			info_box("Success! Please reload web interface");
+			document.getElementById("upgrade_button").value = "reload page";
+			document.getElementById("upgrade_button").style.display = "block";
+			document.getElementById("upgrade_button").disabled = false;
+			document.getElementById("upgrade_button").onclick = function() { location.reload(); }
+		});
+		request.send();
+	} else {
+		error_box("Web interface could not reconnect to your device. Please reload web interface or check device manually")
 	}
 }
 
-// uploads received blob data to the server using cgi-io
 function upload_image(blob) {
-	var upload_request = new XMLHttpRequest();
+	// Uploads received blob data to the server using cgi-io
+	var request = new XMLHttpRequest();
 	var form_data  = new FormData();
 
 	form_data.append("sessionid", data.ubus_rpc_session)
@@ -354,113 +396,123 @@ function upload_image(blob) {
 	form_data.append("filemode", 755) // insecure?
 	form_data.append("filedata", blob)
 
-	upload_request.addEventListener('load', function(event) {
-		// this checksum should be parsed
-		upgrade_info("Flashing firmware", true)
-		ubus_call("rpc-sys", "upgrade_start", { "keep": document.getElementById("keep").checked }, 'message');
-		setTimeout(ping_ubus, 5000)
-		console.log(data.message);
+	request.addEventListener('load', function(event) {
+		request_json = JSON.parse(request.responseText)
+		if(data.checksum != request_json.checksum) {
+			error_box("Checksum missmatch! Please retry")
+		} else {
+			flash_image();
+		}
 	});
 
-	upload_request.addEventListener('error', function(event) {
-		upgrade_info("uploading failed, please retry")
+	request.addEventListener('error', function(event) {
+		info_box("Upload of firmware failed, please retry by reloading web interface")
 	});
 
-	upload_request.open('POST', origin + '/cgi-bin/cgi-upload');
-	upload_request.send(form_data);
+	request.open('POST', origin + '/cgi-bin/cgi-upload');
+	request.send(form_data);
 }
 
-function ping_ubus() {
-	var request = new XMLHttpRequest();
-	request.open("GET", ubus_url, true);
-	request.addEventListener('error', function(event) {
-		upgrade_info("Rebooting", true);
-		setTimeout(ping_ubus, 1000)
-	});
-	request.addEventListener('load', function(event) {
-		upgrade_info("Success! Please reload web interface");
-		document.getElementById("upgrade_button").value = "reload page";
-		document.getElementById("upgrade_button").style.display = "block";
-		document.getElementById("upgrade_button").disabled = false;
-		document.getElementById("upgrade_button").onclick = function() { location.reload(); }
-	});
-	request.send();
-}
 
-// download image from server once the url was received by upgrade_request
 function download_image() {
-	console.log("download_image")
-	document.getElementById("keep_container").style.display = "none";
-	document.getElementById("upgrade_button").style.display = "none";
-	var download_request = new XMLHttpRequest();
-	download_request.open("GET", data.sysupgrade_url);
-	download_request.responseType = "arraybuffer";
-
-	download_request.onload = function () {
-		if (this.status === 200) {
-			var blob = new Blob([download_request.response], {type: "application/octet-stream"});
-			upload_image(blob)
-		}
-	};
-	upgrade_info("downloading image", true);
-	download_request.send();
+	// Download image from server once the url was received by upgrade_request
+	if(data.filesize > data.memory.free) {
+		error_box("Not enough free memory to download firmware. Please stop unneeded services on router and retry")
+	} else {
+		document.getElementById("keep_container").style.display = "none";
+		document.getElementById("upgrade_button").style.display = "none";
+		var download_request = new XMLHttpRequest();
+		download_request.open("GET", data.sysupgrade_url);
+		download_request.responseType = "arraybuffer";
+
+		download_request.onload = function () {
+			if (this.status === 200) {
+				var blob = new Blob([download_request.response], {type: "application/octet-stream"});
+				upload_image(blob)
+			}
+		};
+		info_box("Downloading firmware", true);
+		download_request.send();
+	}
 }
 
-function upgrade_check_callback(response_object) {
-	if (response_object.status === 500) {
-		// python crashed
-		upgrade_error("internal server error, please try again later")
-		console.log("upgrade server issue")
-	} else if (response_object.status === 502) {
-		// python part offline
-		upgrade_error("internal server error, please try again later")
-		console.log("upgrade server issue")
-	} else if (response_object.status === 503) {
-		// handle overload
-		upgrade_error("server overloaded, retry in 5 minutes")
-		console.log("server overloaded")
-		setTimeout(upgrade_request, 300000)
-	} else if (response_object.status === 201) {
-		upgrade_info("Setting up ImageBuilder", true)
-		console.log("setting up imagebuilder")
-		setTimeout(upgrade_request, 5000)
-	} else if (response_object.status === 204) {
-		// no upgrades
-		upgrade_info("No upgrades available")
-	} else if (response_object.status === 400) {
-		// bad request
-		console.log(response_object.responseText)
-		response_object_content = JSON.parse(response_object.responseText)
-		upgrade_error(response_object_content.error)
-	} else if (response_object.status === 200) {
-		// new release/upgrades
-		response_content = JSON.parse(response_object.responseText)
-
-		// create simple output to tell user whats going to be upgrade (release/packages)
-		info_output = ""
-		if(response_content.version != undefined) {
-			info_output += "<h3>new upgrade available</h3>"
-			info_output += data.release.version + " to " + response_content.version
-			data.latest_version = response_content.version;
-		}
-		if(response_content.upgrades != undefined) {
-			info_output += "<h3>package upgrades available</h3>"
-			for (upgrade in response_content.upgrades) {
-				info_output += "<b>" + upgrade + "</b>: " + response_content.upgrades[upgrade][1] + " to " + response_content.upgrades[upgrade][0] + "</br>"
+function server_request(request_dict, path, callback) {
+	request_dict.distro = data.release.distribution;
+	request_dict.target = data.release.target.split("\/")[0];
+	request_dict.subtarget = data.release.target.split("\/")[1];
+	var request = new XMLHttpRequest();
+	request.open("POST", data.url + "/" + path, true);
+	request.setRequestHeader("Content-type", "application/json");
+	request.send(JSON.stringify(request_dict));
+	request.onerror = function(e) {
+		error_box("Upgrade server down or could not connect")
+		document.getElementById("server_div").style.display = "block";
+	}
+	request.addEventListener('load', function(event) {
+		request_text = request.responseText;
+		if (request.status === 200) {
+			callback(request_text)
+
+		} else if (request.status === 202) {
+			var imagebuilder = request.getResponseHeader("X-Imagebuilder-Status");
+			if(imagebuilder === "queue") {
+				// in queue
+				var queue = request.getResponseHeader("X-Build-Queue-Position");
+				info_box("In build queue position " + queue, true)
+				console.log("queued");
+			} else if(imagebuilder === "initialize") {
+				info_box("Setting up ImageBuilder", true)
+				console.log("Setting up imagebuilder");
+			} else if(imagebuilder === "building") {
+				info_box("Building image");
+				console.log("building");
+			} else {
+				info_box("Processing request");
+				console.log(imagebuilder)
 			}
-		}
-		data.packages = response_content.packages
-		upgrade_info(info_output)
+			setTimeout(function() { server_request(request_dict, path, callback) }, 5000)
+
+		} else if (request.status === 204) {
+			// no upgrades available
+			info_box("No upgrades available")
 
-		if(data.advanced_mode == 1) {
-			document.getElementById("edit_button").style.display = "block";
+		} else if (request.status === 400) {
+			// bad request
+			request_json = JSON.parse(request_text)
+			error_box(request_json.error)
+
+		} else if (request.status === 412) {
+			// this is a bit generic
+			error_box("Unsupported device, release, target, subtraget or board")
+
+		} else if (request.status === 413) {
+			error_box("No firmware created due to image size. Try again with less packages selected.")
+
+		} else if (request.status === 422) {
+			error_box("Unknown package in request")
+
+		} else if (request.status === 500) {
+			request_json = JSON.parse(request_text)
+
+			error_box_content = "<b>Internal server error</b></br>"
+			error_box_content += request_json.error
+			if(request_json.log != undefined) {
+				data.log_url = request_json.log
+			}
+			error_box(error_box_content)
+
+		} else if (request.status === 501) {
+			error_box("No sysupgrade file produced, may not supported by modell.")
+
+		} else if (request.status === 502) {
+			// python part offline
+			error_box("Server down for maintenance")
+			setTimeout(function() { server_request(request_dict, path, callback) }, 30000)
+		} else if (request.status === 503) {
+			error_box("Server overloaded")
+			setTimeout(function() { server_request(request_dict, path, callback) }, 30000)
 		}
-		var upgrade_button = document.getElementById("upgrade_button")
-		upgrade_button.value = "Request image";
-		upgrade_button.style.display = "block";
-		upgrade_button.disabled = false;
-		upgrade_button.onclick = upgrade_request;
-	}
+	});
 }
 document.onload = setup()
 </script>
diff --git a/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/attendedsysupgrade.json b/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/attendedsysupgrade.json
index 97aa81492..754931926 100644
--- a/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/attendedsysupgrade.json
+++ b/applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/attendedsysupgrade.json
@@ -4,10 +4,12 @@
 		"read": {
 			"ubus": {
 				"rpc-sys": [
-					"upgrade_start"
+					"upgrade_start",
+					"packagelist"
 				],
 				"system": [
-					"board"
+					"board",
+					"info"
 				],
 				"uci": [
 					"get", "set", "commit"
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index 27971dfda..2c8dfa274 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -1,15 +1,15 @@
 -- Copyright 2017 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
-local json = require("luci.jsonc")
-local nw = require("luci.model.network").init()
-local fw = require("luci.model.firewall").init()
+local fs         = require("nixio.fs")
+local uci        = require("luci.model.uci").cursor()
+local json       = require("luci.jsonc")
+local nw         = require("luci.model.network").init()
+local fw         = require("luci.model.firewall").init()
 local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
-local trminput = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json"
-local uplink = uci.get("network", trmiface) or ""
-local parse = json.parse(fs.readfile(trminput) or "")
+local trminput   = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json"
+local uplink     = uci.get("network", trmiface) or ""
+local parse      = json.parse(fs.readfile(trminput) or "")
 
 m = Map("travelmate", translate("Travelmate"),
 	translate("Configuration of the travelmate package to to enable travel router functionality. ")
@@ -22,20 +22,17 @@ function m.on_after_commit(self)
 	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
 end
 
-s = m:section(NamedSection, "global", "travelmate")
-
 -- Interface Wizard
 
 if uplink == "" then
-	dv = s:option(DummyValue, "", translate("Interface Wizard"))
-	dv.template = "cbi/nullsection"
+	ds = m:section(NamedSection, "global", "travelmate", translate("Interface Wizard"))
 
-	o = s:option(Value, "", translate("Uplink interface"))
+	o = ds:option(Value, "", translate("Uplink interface"))
 	o.datatype = "and(uciname,rangelength(3,15))"
 	o.default = trmiface
 	o.rmempty = false
 
-	btn = s:option(Button, "trm_iface", translate("Create Uplink Interface"),
+	btn = ds:option(Button, "trm_iface", translate("Create Uplink Interface"),
 		translate("Create a new wireless wan uplink interface, configure it to use dhcp and ")
 		.. translate("add it to the wan zone of the firewall. This step has only to be done once."))
 	btn.inputtitle = translate("Add Interface")
@@ -67,6 +64,8 @@ end
 
 -- Main travelmate options
 
+s = m:section(NamedSection, "global", "travelmate")
+
 o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate"))
 o1.default = o1.disabled
 o1.rmempty = false
@@ -98,16 +97,11 @@ o4.default = 2
 o4.datatype = "range(1,90)"
 o4.rmempty = false
 
-o5 = s:option(Flag, "trm_debug", translate("Enable verbose debug logging"))
-o5.default = o5.disabled
-o5.rmempty = false
-
 -- Runtime information
 
-ds = s:option(DummyValue, "_dummy", translate("Runtime information"))
-ds.template = "cbi/nullsection"
+ds = m:section(NamedSection, "global", "travelmate", translate("Runtime Information"))
 
-dv1 = s:option(DummyValue, "status", translate("Online Status"))
+dv1 = ds:option(DummyValue, "status", translate("Online Status"))
 dv1.template = "travelmate/runtime"
 if parse == nil then
 	dv1.value = translate("n/a")
@@ -117,7 +111,7 @@ else
 	dv1.value = translate("not connected")
 end
 
-dv2 = s:option(DummyValue, "travelmate_version", translate("Travelmate version"))
+dv2 = ds:option(DummyValue, "travelmate_version", translate("Travelmate version"))
 dv2.template = "travelmate/runtime"
 if parse ~= nil then
 	dv2.value = parse.data.travelmate_version or translate("n/a")
@@ -125,15 +119,15 @@ else
 	dv2.value = translate("n/a")
 end
 
-dv3 = s:option(DummyValue, "station_ssid", translate("Station SSID"))
+dv3 = ds:option(DummyValue, "station_id", translate("Station ID (SSID/BSSID)"))
 dv3.template = "travelmate/runtime"
 if parse ~= nil then
-	dv3.value = parse.data.station_ssid or translate("n/a")
+	dv3.value = parse.data.station_id or translate("n/a")
 else
 	dv3.value = translate("n/a")
 end
 
-dv4 = s:option(DummyValue, "station_interface", translate("Station Interface"))
+dv4 = ds:option(DummyValue, "station_interface", translate("Station Interface"))
 dv4.template = "travelmate/runtime"
 if parse ~= nil then
 	dv4.value = parse.data.station_interface or translate("n/a")
@@ -141,7 +135,7 @@ else
 	dv4.value = translate("n/a")
 end
 
-dv5 = s:option(DummyValue, "station_radio", translate("Station Radio"))
+dv5 = ds:option(DummyValue, "station_radio", translate("Station Radio"))
 dv5.template = "travelmate/runtime"
 if parse ~= nil then
 	dv5.value = parse.data.station_radio or translate("n/a")
@@ -149,7 +143,7 @@ else
 	dv5.value = translate("n/a")
 end
 
-dv6 = s:option(DummyValue, "last_rundate", translate("Last rundate"))
+dv6 = ds:option(DummyValue, "last_rundate", translate("Last rundate"))
 dv6.template = "travelmate/runtime"
 if parse ~= nil then
 	dv6.value = parse.data.last_rundate or translate("n/a")
@@ -162,28 +156,32 @@ end
 e = m:section(NamedSection, "global", "travelmate", translate("Extra options"),
 translate("Options for further tweaking in case the defaults are not suitable for you."))
 
-e1 = e:option(Value, "trm_radio", translate("Radio selection"),
+e1 = e:option(Flag, "trm_debug", translate("Enable verbose debug logging"))
+e1.default = e1.disabled
+e1.rmempty = false
+
+e2 = e:option(Value, "trm_radio", translate("Radio selection"),
 	translate("Restrict travelmate to a dedicated radio, e.g. 'radio0'."))
-e1.datatype = "and(uciname,rangelength(6,6))"
-e1.rmempty = true
+e2.datatype = "and(uciname,rangelength(6,6))"
+e2.rmempty = true
 
-e2 = e:option(Value, "trm_maxretry", translate("Connection Limit"),
+e3 = e:option(Value, "trm_maxretry", translate("Connection Limit"),
 	translate("How many times should travelmate try to connect to an Uplink. ")
 	.. translate("To disable this feature set it to '0' which means unlimited retries."))
-e2.default = 3
-e2.datatype = "range(0,30)"
-e2.rmempty = false
+e3.default = 3
+e3.datatype = "range(0,30)"
+e3.rmempty = false
 
-e3 = e:option(Value, "trm_maxwait", translate("Interface Timeout"),
+e4 = e:option(Value, "trm_maxwait", translate("Interface Timeout"),
 	translate("How long should travelmate wait for a successful wlan interface reload."))
-e3.default = 30
-e3.datatype = "range(5,60)"
-e3.rmempty = false
+e4.default = 30
+e4.datatype = "range(5,60)"
+e4.rmempty = false
 
-e4 = e:option(Value, "trm_timeout", translate("Overall Timeout"),
+e5 = e:option(Value, "trm_timeout", translate("Overall Timeout"),
 	translate("Timeout in seconds between retries in 'automatic' mode."))
-e4.default = 60
-e4.datatype = "range(60,300)"
-e4.rmempty = false
+e5.default = 60
+e5.datatype = "range(60,300)"
+e5.rmempty = false
 
 return m
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index dcfa17c8b..921e1b832 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -1,10 +1,11 @@
 -- Copyright 2017 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
-local http = require("luci.http")
+local fs       = require("nixio.fs")
+local uci      = require("luci.model.uci").cursor()
+local http     = require("luci.http")
 local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
+local val      = ""
 
 m = SimpleForm("add", translate("Add Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -18,6 +19,7 @@ end
 m.hidden = {
 	device      = http.formvalue("device"),
 	ssid        = http.formvalue("ssid"),
+	bssid       = http.formvalue("bssid"),
 	wep         = http.formvalue("wep"),
 	wpa_suites  = http.formvalue("wpa_suites"),
 	wpa_version = http.formvalue("wpa_version")
@@ -25,23 +27,47 @@ m.hidden = {
 
 if m.hidden.ssid ~= "" then
 	wssid = m:field(Value, "ssid", translate("SSID"))
-	wssid.default = m.hidden.ssid
+	wssid.datatype = "rangelength(1,32)"
+	wssid.default = m.hidden.ssid or ""
 else
 	wssid = m:field(Value, "ssid", translate("SSID (hidden)"))
 end
 
+bssid = m:field(Value, "bssid", translate("BSSID"))
+bssid.datatype = "macaddr"
+bssid.default = m.hidden.bssid or ""
+
 if (tonumber(m.hidden.wep) or 0) == 1 then
 	wkey = m:field(Value, "key", translate("WEP passphrase"),
 		translate("Specify the secret encryption key here."))
 	wkey.password = true
 	wkey.datatype = "wepkey"
-elseif (tonumber(m.hidden.wpa_version) or 0) > 0 and
-	(m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2")
-then
-	wkey = m:field(Value, "key", translate("WPA passphrase"),
-		translate("Specify the secret encryption key here."))
-	wkey.password = true
-	wkey.datatype = "wpakey"
+elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
+	if m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2" then
+		wkey = m:field(Value, "key", translate("WPA passphrase"),
+			translate("Specify the secret encryption key here."))
+		wkey.password = true
+		wkey.datatype = "wpakey"
+	elseif m.hidden.wpa_suites == "802.1X" then
+		eaptype = m:field(ListValue, "eap_type", translate("EAP-Method"))
+		eaptype:value("TLS")
+		eaptype:value("TTLS")
+		eaptype:value("PEAP")
+		eaptype.default = "PEAP"
+
+		authentication = m:field(ListValue, "auth", translate("Authentication"))
+		authentication:value("PAP")
+		authentication:value("CHAP")
+		authentication:value("MSCHAP")
+		authentication:value("MSCHAPV2")
+		authentication.default = "MSCHAPV2"
+
+		ident = m:field(Value, "identity", translate("Identity"))
+
+		pass = m:field(Value, "password", translate("Password"))
+		pass.datatype = "wpakey"
+		pass.password = true
+	end
 end
 
 function wssid.write(self, section, value)
@@ -50,15 +76,38 @@ function wssid.write(self, section, value)
 		network  = trmiface,
 		device   = m.hidden.device,
 		ssid     = wssid:formvalue(section),
+		bssid    = bssid:formvalue(section),
 		disabled = "1"
 	})
+	if wkey ~= nil then
+		val = wkey:formvalue(section)
+		if val == "" then
+			val = "changeme"
+		end
+	end
 	if (tonumber(m.hidden.wep) or 0) == 1 then
 		uci:set("wireless", newsection, "encryption", "wep-open")
 		uci:set("wireless", newsection, "key", "1")
-		uci:set("wireless", newsection, "key1", wkey:formvalue(section))
+		uci:set("wireless", newsection, "key1", val)
 	elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
-		uci:set("wireless", newsection, "encryption", "psk2")
-		uci:set("wireless", newsection, "key", wkey:formvalue(section))
+		if m.hidden.wpa_suites == "PSK" or m.hidden.wpa_suites == "PSK2" then
+			uci:set("wireless", newsection, "encryption", "psk2")
+			uci:set("wireless", newsection, "key", val)
+		elseif m.hidden.wpa_suites == "802.1X" then
+			uci:set("wireless", newsection, "encryption", "wpa2")
+			uci:set("wireless", newsection, "eap_type", eaptype:formvalue(section))
+			uci:set("wireless", newsection, "auth", authentication:formvalue(section))
+			val = ident:formvalue(section)
+			if val == "" then
+				val = "changeme"
+			end
+			uci:set("wireless", newsection, "identity", val)
+			val = pass:formvalue(section)
+			if val == "" then
+				val = "changeme"
+			end
+			uci:set("wireless", newsection, "password", val)
+		end
 	else
 		uci:set("wireless", newsection, "encryption", "none")
 	end
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index c60ff22c4..1baca5be4 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -1,9 +1,10 @@
 -- Copyright 2017 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs = require("nixio.fs")
-local uci = require("luci.model.uci").cursor()
+local fs   = require("nixio.fs")
+local uci  = require("luci.model.uci").cursor()
 local http = require("luci.http")
+local val  = ""
 
 m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -21,8 +22,15 @@ m.hidden = {
 local s = uci:get_all("wireless", m.hidden.cfg)
 if s ~= nil then
 	wssid = m:field(Value, "ssid", translate("SSID"))
-	wssid.default = s.ssid
 	wssid.datatype = "rangelength(1,32)"
+	wssid.default = s.ssid
+	bssid = m:field(Value, "bssid", translate("BSSID"))
+	bssid.datatype = "macaddr"
+	bssid.default = s.bssid
+	if s.identity then
+		ident = m:field(Value, "identity", translate("Identity"))
+		ident.default = s.identity
+	end
 	if s.encryption and s.key then
 		wkey = m:field(Value, "key", translatef("Passphrase (%s)", s.encryption))
 	elseif s.encryption and s.password then
@@ -43,10 +51,25 @@ end
 
 function wssid.write(self, section, value)
 	uci:set("wireless", m.hidden.cfg, "ssid", wssid:formvalue(section))
-	if s.encryption and s.key then
-		uci:set("wireless", m.hidden.cfg, "key", wkey:formvalue(section))
-	elseif s.encryption and s.password then
-		uci:set("wireless", m.hidden.cfg, "password", wkey:formvalue(section))
+	uci:set("wireless", m.hidden.cfg, "bssid", bssid:formvalue(section))
+	if s.identity then
+		val = ident:formvalue(section)
+		if val == "" then
+			val = "changeme"
+		end
+		uci:set("wireless", m.hidden.cfg, "identity", val)
+	end
+
+	if s.encryption and s.encryption ~= "none" then
+		val = wkey:formvalue(section)
+		if val == "" then
+			val = "changeme"
+		end
+		if s.key then
+			uci:set("wireless", m.hidden.cfg, "key", val)
+		elseif s.password then
+			uci:set("wireless", m.hidden.cfg, "password", val)
+		end
 	end
 	uci:save("wireless")
 	uci:commit("wireless")
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm
index 53493a18f..2233a15e3 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm
@@ -6,5 +6,8 @@
 		font-size: 12px;
 		font-family: monospace;
 		resize: none;
+		white-space: pre;
+		overflow-wrap: normal;
+		overflow-x: scroll;
 	}
 </style>
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index cbb6c189b..402b1c15c 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -22,6 +22,7 @@ This is free software, licensed under the Apache License, Version 2.0
     <tr class="cbi-section-table-titles">
       <th class="cbi-section-table-cell" style="text-align:left"><%:Device%></th>
       <th class="cbi-section-table-cell" style="text-align:left"><%:SSID%></th>
+      <th class="cbi-section-table-cell" style="text-align:left"><%:BSSID%></th>
       <th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
       <th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th>
     </tr>
@@ -32,6 +33,7 @@ This is free software, licensed under the Apache License, Version 2.0
       local section = s['.name'] or ""
       local device = s.device or ""
       local ssid = s.ssid or ""
+      local bssid = s.bssid or ""
       local encryption = s.encryption or ""
       local disabled = s.disabled or ""
       local style = "color:#000000"
@@ -42,14 +44,15 @@ This is free software, licensed under the Apache License, Version 2.0
     <tr class="cbi-section-table-row cbi-rowstyle-1" style="<%=style%>">
       <td style="text-align:left"><%=device%></td>
       <td style="text-align:left"><%=ssid%></td>
+      <td style="text-align:left"><%=bssid%></td>
       <td style="text-align:left"><%=encryption%></td>
       <td class="cbi-value-field" style="width:70px;text-align:right">
-        <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
-        <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
+        <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
+        <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
       </td>
       <td class="cbi-value-field" style="width:150px;text-align:right">
-        <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
-        <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
+        <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
+        <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
       </td>
     </tr>
 <%
@@ -63,7 +66,7 @@ This is free software, licensed under the Apache License, Version 2.0
   uci:foreach("wireless", "wifi-device", function(s)
     local device = s[".name"]
 %>
-  <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
+  <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post">
     <input type="hidden" name="device" value="<%=device%>"/>
     <input type="hidden" name="token" value="<%=token%>"/>
     <input type="submit" class="cbi-button cbi-button-find" title="<%:Find and join network on %><%=device%>" value="<%:Scan %><%=device%>"/>
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index af90c18d2..68ca63f45 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -17,7 +17,7 @@ This is free software, licensed under the Apache License, Version 2.0
         if info.wep == true then
             return translate("WEP")
         elseif info.wpa > 0 then
-            return translate("WPA / WPA2")
+            return translate("WPA/WPA2 - " .. table.concat(info.auth_suites))
         elseif info.enabled then
             return translate("Unknown")
         else
@@ -28,7 +28,7 @@ This is free software, licensed under the Apache License, Version 2.0
     function percent_wifi_signal(info)
         local qc = info.quality or 0
         local qm = info.quality_max or 0
-        if info.ssid and qc > 0 and qm > 0 then
+        if info.bssid and qc > 0 and qm > 0 then
             return math.floor((100 / qm) * qc)
         else
             return 0
@@ -44,13 +44,17 @@ This is free software, licensed under the Apache License, Version 2.0
         <table class="cbi-section-table" style="empty-cells:hide">
             <tr class="cbi-section-table-titles">
                 <th class="cbi-section-table-cell" style="text-align:left"><%:Uplink SSID%></th>
+                <th class="cbi-section-table-cell" style="text-align:left"><%:Uplink BSSID%></th>
                 <th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
                 <th class="cbi-section-table-cell" style="text-align:left" colspan="2"><%:Signal strength%></th>
             </tr>
             <% for i, net in ipairs(iw.scanlist or { }) do %>
             <tr class="cbi-section-table-row cbi-rowstyle-1">
                 <td class="cbi-value-field" style="text-align:left">
-                    <strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
+                    <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
+                </td>
+                <td class="cbi-value-field" style="text-align:left">
+                    <%=net.bssid and utl.pcdata(net.bssid)%>
                 </td>
                 <td class="cbi-value-field" style="text-align:left">
                     <%=format_wifi_encryption(net.encryption)%>
@@ -59,10 +63,11 @@ This is free software, licensed under the Apache License, Version 2.0
                     <%=percent_wifi_signal(net)%> %
                 </td>
                 <td class="cbi-value-field" style="width:100px;text-align:right">
-                    <form class="inline" action="<%=url('admin/services/travelmate/wifiadd')%>" method="post">
+                    <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post">
                         <input type="hidden" name="token" value="<%=token%>"/>
                         <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
                         <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>"/>
+                        <input type="hidden" name="bssid" value="<%=utl.pcdata(net.bssid)%>"/>
                         <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>"/>
                         <% if net.encryption.wpa then %>
                         <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>"/>
@@ -76,12 +81,12 @@ This is free software, licensed under the Apache License, Version 2.0
         </table>
     </fieldset>
 <div class="cbi-page-actions right">
-    <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
+    <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post">
         <input type="hidden" name="token" value="<%=token%>"/>
         <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
         <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/>
     </form>
-    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
+    <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="post">
         <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
     </form>
 </div>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 9f44ac76d..18f66c2a8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -38,7 +38,7 @@
 		local wan6 = ntm:get_wan6net()
 
 		local conn_count = tonumber(
-			fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count")) or 0
+			fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count") or "") or 0
 
 		local conn_max = tonumber((
 			luci.sys.exec("sysctl net.nf_conntrack_max") or