diff --git a/core/main/client/browser.js b/core/main/client/browser.js index b7d2b69e9..de2675370 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -3972,17 +3972,6 @@ beef.browser = { return results; }, - /** - * Returns zombie screen size and color depth. - */ - getScreenSize: function () { - return { - width: window.screen.width, - height: window.screen.height, - colordepth: window.screen.colorDepth - } - }, - /** * Returns zombie browser window size. * @from: http://www.howtocreate.co.uk/tutorials/javascript/browserwindow @@ -4047,7 +4036,7 @@ beef.browser = { else if (typeof value == 'object') return value; else return undefined; }); - var screen_size = beef.browser.getScreenSize(); + var screen_size = beef.hardware.getScreenSize(); var window_size = beef.browser.getWindowSize(); var vbscript_enabled = (beef.browser.hasVBScript()) ? "Yes" : "No"; var has_flash = (beef.browser.hasFlash()) ? "Yes" : "No"; diff --git a/core/main/client/browser/popup.js b/core/main/client/browser/popup.js index 8c4dad760..f2c6609b0 100644 --- a/core/main/client/browser/popup.js +++ b/core/main/client/browser/popup.js @@ -16,7 +16,7 @@ beef.browser.popup = { blocker_enabled: function () { - screenParams = beef.browser.getScreenSize(); + screenParams = beef.hardware.getScreenSize(); var popUp = window.open('/', 'windowName0', 'width=1, height=1, left='+screenParams.width+', top='+screenParams.height+', scrollbars, resizable'); if (popUp == null || typeof(popUp)=='undefined') { return true; diff --git a/core/main/client/hardware.js b/core/main/client/hardware.js index b234b4418..c68fc064b 100644 --- a/core/main/client/hardware.js +++ b/core/main/client/hardware.js @@ -37,6 +37,17 @@ beef.hardware = { return arch; }, + /** + * Returns zombie screen size and color depth. + */ + getScreenSize: function () { + return { + width: window.screen.width, + height: window.screen.height, + colordepth: window.screen.colorDepth + } + }, + /* * @return: {Boolean} true or false. **/