diff --git a/modules/helmaTools.zip b/modules/helmaTools.zip deleted file mode 100644 index 4eee14a0..00000000 Binary files a/modules/helmaTools.zip and /dev/null differ diff --git a/modules/tools/Global/helma.auth.js b/modules/tools/Global/helma.auth.js index c71a06c7..9e2abc50 100644 --- a/modules/tools/Global/helma.auth.js +++ b/modules/tools/Global/helma.auth.js @@ -49,7 +49,7 @@ helma.auth = function(realm) { var accessAllowed = true; if (req.data.username && req.data.password) { if (pw && hostIsAllowed()) { - if (pw == Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password)) { + if (pw == Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password)) { session.data[realm+'Authenticated'] = true; res.redirect(res.data.href); } else { @@ -61,7 +61,7 @@ helma.auth = function(realm) { The adminAccess property is not set.
\ Before proceeding, add the following line to your app.properties or server.properties file:\

adminAccess=' - + Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password); + + Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password); else param.message += 'The '+ realm +'AccessAllowed property does not match your host.
\ Before proceeding, remove this property from your app.properties or server.properties file \ or include your host as follows:

' diff --git a/src/dist/apps/manage/Global/functions.js b/src/dist/apps/manage/Global/functions.js index 7c40b5b7..98b840a0 100644 --- a/src/dist/apps/manage/Global/functions.js +++ b/src/dist/apps/manage/Global/functions.js @@ -46,7 +46,7 @@ function createAddressFilter() { } -/** +/** * updates the stats in app.data.stat every 5 minutes */ function appStat() { @@ -123,7 +123,7 @@ function checkAuth(appObj) { if (uname == null || uname == "" || pwd == null || pwd == "") return forceAuth(); - var md5key = Packages.helma.util.MD5Encoder.encode(uname + "-" + pwd); + var md5key = Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(uname + "-" + pwd); if (md5key == adminAccess) return true; diff --git a/src/dist/apps/manage/Root/actions.js b/src/dist/apps/manage/Root/actions.js index aac54dc7..4c7c68a8 100644 --- a/src/dist/apps/manage/Root/actions.js +++ b/src/dist/apps/manage/Root/actions.js @@ -75,7 +75,7 @@ function makekey_action() { res.data.body = renderSkinAsString("pwdform", obj); } else { // render the md5-string: - obj.propsString = "adminAccess=" + Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password) + "
\n"; + obj.propsString = "adminAccess=" + Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password) + "
\n"; res.data.body = renderSkinAsString("pwdfeedback", obj); } @@ -127,4 +127,4 @@ function mrtg_action() { } else { res.write("0\n0\n0\n0\n"); } -} \ No newline at end of file +}