diff --git a/electron/lib/utils.js b/electron/lib/utils.js index f7fa0f063..a1bce2940 100644 --- a/electron/lib/utils.js +++ b/electron/lib/utils.js @@ -274,10 +274,11 @@ const utils = { * @param weburl * @returns {string|string} */ - getDomain(weburl) { + getDomain(weburl, toLowerCase = true) { const urlReg = /http(s)?:\/\/([^\/]+)/i; const domain = `${weburl}`.match(urlReg); - return ((domain != null && domain.length > 0) ? domain[2] : ""); + const result = ((domain != null && domain.length > 0) ? domain[2] : ""); + return toLowerCase ? result.toLowerCase() : result; }, /** diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index f167b3d8a..38f42b827 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -518,7 +518,7 @@ const timezone = require("dayjs/plugin/timezone"); * @param defaultValue * @returns {string|*} */ - getObject(obj, keys, defaultValue = undefined) { + getObject(obj, keys, defaultValue = "") { let keyArray; if (typeof keys === 'string') { keyArray = keys.replace(/,/g, "|").replace(/\./g, "|").split("|");