corrade-nucleus-nucleons

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ HEAD  →  ?path2? @ 1
/bootstrap/001_bootstrap/bootstrap/js/corrade-bootstrap-processor.js
@@ -23,24 +23,22 @@
var form = formToObject('cfgform');
// Set progress.
$('#progressbar').css("width", 20 + "%").attr("aria-valuenow", 20).text(20 + "%");
$.ajax({
type: 'GET',
url: '/cfg/Corrade.ini.default',
dataType: 'text',
success: function(data) {
$.ajax({
type: 'GET',
url: '/cfg/Corrade.ini.default'
//dataType: 'xml'
}).done(function(data) {
// Set progress.
$('#progressbar').css("width", 40 + "%").attr("aria-valuenow", 40).text(40 + "%");
// Get default configuration.
var x2js = new X2JS();
var defCfg = x2js.xml2js(data);
var defCfg = x2js.xml2json(data);
// Set configuration properties.
defCfg.Configuration.FirstName = form.firstname;
defCfg.Configuration.LastName = form.lastname;
var loginHash = forge.md.md5.create();
loginHash.update(form.password);
defCfg.Configuration.Password = "$1$" + loginHash.digest().toHex();
defCfg.Configuration.Password = "$1$" + CryptoJS.MD5(form.password).toString(CryptoJS.enc.Hex);
defCfg.Configuration.LoginURL = form.loginurl;
// Set Nucleus prefix.
defCfg.Configuration.NucleusServerPrefix = 'http://+:' + location.port + "/";
@@ -48,9 +46,7 @@
var group = defCfg.Configuration.Groups.Group;
// Set parameters.
group.Name = form.groupname;
var groupHash = forge.md.sha1.create();
groupHash.update(form.grouppassword);
group.Password = groupHash.digest().toHex();
group.Password = CryptoJS.SHA1(form.grouppassword).toString(CryptoJS.enc.Hex);
group.UUID = form.groupuuid;
// Set single group.
defCfg.Configuration.Groups.Group = [ group ];
@@ -65,7 +61,7 @@
$.ajax({
type: 'PUT',
url: '/cfg/Corrade.ini',
data: x2js.js2xml(defCfg),
data: x2js.json2xml_str(defCfg),
contentType: "text/html"
}).done(function(data) {
// Set progress.
@@ -77,7 +73,6 @@
$('#popup').modal('hide');
});
});
}
});
});