corrade-nucleus-nucleons

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