From 7a985b445e77dc3183f9c3a5fb0d838d33179c4c Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Wed, 22 Jan 2020 14:53:55 -0500 Subject: [PATCH] removed extra debug, added debug for user awareness. --- .../qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml | 4 +--- libraries/script-engine/src/ScriptEngine.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml index c9c56bfe81..3de86c31d9 100644 --- a/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml +++ b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml @@ -57,13 +57,12 @@ Rectangle { function toggleWhitelist(enabled) { Settings.setValue("private/whitelistEnabled", enabled); - console.info("NANI?",enabled); + console.info("Toggling Whitelist to:", enabled); } function initCheckbox() { var check = Settings.getValue("private/whitelistEnabled"); - console.info("Triggered init. Val:", check); if (check == true) { whitelistEnabled.toggle(); } @@ -102,7 +101,6 @@ Rectangle { anchors.top: parent.top; anchors.topMargin: 10; onToggled: { - console.info("Triggered.0"); toggleWhitelist(whitelistEnabled.checked) } diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index d8f65e0506..40f43ee22f 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2374,9 +2374,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co bool whitelistEnabled = _whitelistEnabled.get(); if (!whitelistEnabled) { + qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; passList = true; } - qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; // PULL SAFEURLS FROM INTERFACE.JSON Settings QVariant raw = Setting::Handle("private/settingsSafeURLS").get(); @@ -2391,7 +2391,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co QString domainSafeURL = URL_SCHEME_HIFI + "://" + currentDomain; for (const auto& str : safeURLPrefixes) { if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) { - qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed. Current Domain Host: " + qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: " << nodeList->getDomainHandler().getHostname() << "Current Domain: " << currentDomain; passList = true;