node/APT: whitespace cleanup

[proxmox-widget-toolkit.git] / Utils.js

diff --git a/Utils.js b/Utils.js
index 37eba47b2c3b2a610b8cfd257498a5258f710ab5..645c5250cf64803e280b466b9cd04309291f81f4 100644 (file)
--- a/Utils.js
+++ b/Utils.js
@@ -179,11 +179,26 @@ Ext.define('Proxmox.Utils', { utilities: {
        return min < width ? width : min;
     },
 
+    setAuthData: function(data) {
+       Proxmox.CSRFPreventionToken = data.CSRFPreventionToken;
+       Proxmox.UserName = data.username;
+       Proxmox.LoggedOut = data.LoggedOut;
+       // creates a session cookie (expire = null)
+       // that way the cookie gets deleted after the browser window is closed
+       Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, data.ticket, null, '/', null, true);
+    },
+
     authOK: function() {
+       if (Proxmox.LoggedOut) {
+           return undefined;
+       }
        return (Proxmox.UserName !== '') && Ext.util.Cookies.get(Proxmox.Setup.auth_cookie_name);
     },
 
     authClear: function() {
+       if (Proxmox.LoggedOut) {
+           return undefined;
+       }
        Ext.util.Cookies.clear(Proxmox.Setup.auth_cookie_name);
     },
 
@@ -447,7 +462,8 @@ Ext.define('Proxmox.Utils', { utilities: {
        qmstop: [ 'VM', gettext('Stop') ],
        qmreset: [ 'VM', gettext('Reset') ],
        qmshutdown: [ 'VM', gettext('Shutdown') ],
-       qmsuspend: [ 'VM', gettext('Suspend') ],
+       qmsuspend: [ 'VM', gettext('Hibernate') ],
+       qmpause: [ 'VM', gettext('Pause') ],
        qmresume: [ 'VM', gettext('Resume') ],
        qmconfig: [ 'VM', gettext('Configure') ],
        vzsnapshot: [ 'CT', gettext('Snapshot') ],
@@ -486,9 +502,9 @@ Ext.define('Proxmox.Utils', { utilities: {
        cephdestroymds: ['Ceph Metadata Server', gettext('Destroy') ],
        imgcopy: ['', gettext('Copy data') ],
        imgdel: ['', gettext('Erase data') ],
-       unknownimgdel: ['', gettext('Destroy image from unkown guest') ],
+       unknownimgdel: ['', gettext('Destroy image from unknown guest') ],
        download: ['', gettext('Download') ],
-       vzdump: ['', gettext('Backup') ],
+       vzdump: ['VM/CT', gettext('Backup') ],
        aptupdate: ['', gettext('Update package database') ],
        startall: [ '', gettext('Start all VMs and Containers') ],
        stopall: [ '', gettext('Stop all VMs and Containers') ],
@@ -577,16 +593,20 @@ Ext.define('Proxmox.Utils', { utilities: {
        return Ext.Date.format(servertime, 'Y-m-d H:i:s');
     },
 
-    openXtermJsViewer: function(vmtype, vmid, nodename, vmname) {
-       var url = Ext.urlEncode({
+    openXtermJsViewer: function(vmtype, vmid, nodename, vmname, cmd) {
+       var url = Ext.Object.toQueryString({
            console: vmtype, // kvm, lxc, upgrade or shell
            xtermjs: 1,
            vmid: vmid,
            vmname: vmname,
-           node: nodename
+           node: nodename,
+           cmd: cmd,
+
        });
        var nw = window.open("?" + url, '_blank', 'toolbar=no,location=no,status=no,menubar=no,resizable=yes,width=800,height=420');
-       nw.focus();
+       if (nw) {
+           nw.focus();
+       }
     }
 
 },
@@ -600,10 +620,12 @@ Ext.define('Proxmox.Utils', { utilities: {
        var IPV4_REGEXP = "(?:(?:" + IPV4_OCTET + "\\.){3}" + IPV4_OCTET + ")";
        var IPV6_H16 = "(?:[0-9a-fA-F]{1,4})";
        var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")";
+       var IPV4_CIDR_MASK = "([0-9]{1,2})";
+       var IPV6_CIDR_MASK = "([0-9]{1,3})";
 
 
        me.IP4_match = new RegExp("^(?:" + IPV4_REGEXP + ")$");
-       me.IP4_cidr_match = new RegExp("^(?:" + IPV4_REGEXP + ")\/([0-9]{1,2})$");
+       me.IP4_cidr_match = new RegExp("^(?:" + IPV4_REGEXP + ")\/" + IPV4_CIDR_MASK + "$");
 
        var IPV6_REGEXP = "(?:" +
            "(?:(?:"                                                  + "(?:" + IPV6_H16 + ":){6})" + IPV6_LS32 + ")|" +
@@ -618,10 +640,11 @@ Ext.define('Proxmox.Utils', { utilities: {
            ")";
 
        me.IP6_match = new RegExp("^(?:" + IPV6_REGEXP + ")$");
-       me.IP6_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + ")\/([0-9]{1,3})$");
+       me.IP6_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + ")\/" + IPV6_CIDR_MASK + "$");
        me.IP6_bracket_match = new RegExp("^\\[(" + IPV6_REGEXP + ")\\]");
 
        me.IP64_match = new RegExp("^(?:" + IPV6_REGEXP + "|" + IPV4_REGEXP + ")$");
+       me.IP64_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + "\/" + IPV6_CIDR_MASK + ")|(?:" + IPV4_REGEXP + "\/" + IPV4_CIDR_MASK + ")$");
 
        var DnsName_REGEXP = "(?:(([a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?)\\.)*([A-Za-z0-9]([A-Za-z0-9\\-]*[A-Za-z0-9])?))";
        me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$");