X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FUtils.js;h=abbad36f67e276e15274ddd305fd47355481882d;hb=017e3e306d61d02a26dee26eb3b246cc959316e0;hp=d5a2e84372a460d1aa21279edf515502f404c027;hpb=abfc18575e7edd0aeb4da7d17017c7b792c2a088;p=proxmox-widget-toolkit.git

diff --git a/src/Utils.js b/src/Utils.js
index d5a2e84..abbad36 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -461,7 +461,7 @@ utilities: {
 		success: function(response, opts) {
 		    let res = response.result;
 		    if (res === null || res === undefined || !res || res
-			.data.status !== 'Active') {
+			.data.status.toLowerCase() !== 'active') {
 			Ext.Msg.show({
 			    title: gettext('No valid subscription'),
 			    icon: Ext.Msg.WARNING,
@@ -646,6 +646,7 @@ utilities: {
 	stopall: ['', gettext('Stop all VMs and Containers')],
 	migrateall: ['', gettext('Migrate all VMs and Containers')],
 	dircreate: [gettext('Directory Storage'), gettext('Create')],
+	dirremove: [gettext('Directory'), gettext('Remove')],
 	lvmcreate: [gettext('LVM Storage'), gettext('Create')],
 	lvmthincreate: [gettext('LVM-Thin Storage'), gettext('Create')],
 	zfscreate: [gettext('ZFS Storage'), gettext('Create')],
@@ -710,6 +711,65 @@ utilities: {
 	return Proxmox.Utils.format_duration_long(uptime);
     },
 
+    systemd_unescape: function(string_value) {
+	const charcode_0 = '0'.charCodeAt(0);
+	const charcode_9 = '9'.charCodeAt(0);
+	const charcode_A = 'A'.charCodeAt(0);
+	const charcode_F = 'F'.charCodeAt(0);
+	const charcode_a = 'a'.charCodeAt(0);
+	const charcode_f = 'f'.charCodeAt(0);
+	const charcode_x = 'x'.charCodeAt(0);
+	const charcode_minus = '-'.charCodeAt(0);
+	const charcode_slash = '/'.charCodeAt(0);
+	const charcode_backslash = '\\'.charCodeAt(0);
+
+	let parse_hex_digit = function(d) {
+	    if (d >= charcode_0 && d <= charcode_9) {
+		return d - charcode_0;
+	    }
+	    if (d >= charcode_A && d <= charcode_F) {
+		return d - charcode_A + 10;
+	    }
+	    if (d >= charcode_a && d <= charcode_f) {
+		return d - charcode_a + 10;
+	    }
+	    throw "got invalid hex digit";
+	};
+
+	let value = new TextEncoder().encode(string_value);
+	let result = new Uint8Array(value.length);
+
+	let i = 0;
+	let result_len = 0;
+
+	while (i < value.length) {
+	    let c0 = value[i];
+	    if (c0 === charcode_minus) {
+		result.set([charcode_slash], result_len);
+		result_len += 1;
+		i += 1;
+		continue;
+	    }
+	    if ((i + 4) < value.length) {
+		let c1 = value[i+1];
+		if (c0 === charcode_backslash && c1 === charcode_x) {
+		    let h1 = parse_hex_digit(value[i+2]);
+		    let h0 = parse_hex_digit(value[i+3]);
+		    let ord = h1*16+h0;
+		    result.set([ord], result_len);
+		    result_len += 1;
+		    i += 4;
+		    continue;
+		}
+	    }
+	    result.set([c0], result_len);
+	    result_len += 1;
+	    i += 1;
+	}
+
+	return new TextDecoder().decode(result.slice(0, result.len));
+    },
+
     parse_task_upid: function(upid) {
 	let task = {};
 
@@ -725,7 +785,7 @@ utilities: {
 	}
 	task.starttime = parseInt(res[6], 16);
 	task.type = res[7];
-	task.id = res[8];
+	task.id = Proxmox.Utils.systemd_unescape(res[8]);
 	task.user = res[9];
 
 	task.desc = Proxmox.Utils.format_task_description(task.type, task.id);