History

scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly.

Kasen IO committed 6 years ago

Commit fe66dc81 parent f49e64b2 files · +6 −5Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−2
@@ -2370,7 +2370,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2369 unmodified lines
2370 // PULL SAFEURLS FROM INTERFACE.JSON Settings2370 // PULL SAFEURLS FROM INTERFACE.JSON Settings
2371 2371
2372 QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();2372 QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
2373 QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+"));2373 QStringList settingsSafeURLS = raw.toString().split(QRegExp("\\s*[,\r\n]+\\s*"));
2374 safeURLS += settingsSafeURLS;2374 safeURLS += settingsSafeURLS;
2375 2375
2376 // END PULL SAFEURLS FROM INTERFACE.JSON Settings2376 // END PULL SAFEURLS FROM INTERFACE.JSON Settings
@@ -2378,10 +2378,11 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 1 unmodified line
2378 bool isInWhitelist = false; // assume unsafe2378 bool isInWhitelist = false; // assume unsafe
2379 for (const auto& str : safeURLS) {2379 for (const auto& str : safeURLS) {
2380 // qDebug() << "CHECKING" << entityID.toString() << scriptOrURL << "AGAINST" << str;2380 // qDebug() << "CHECKING" << entityID.toString() << scriptOrURL << "AGAINST" << str;
2381 qCDebug(scriptengine) << "SCRIPT URL STARTSWITH" << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN"2381 qCDebug(scriptengine) << "Script URL: " << scriptOrURL << "TESTING AGAINST" << str << "RESULTS IN"
2382 << scriptOrURL.startsWith(str);2382 << scriptOrURL.startsWith(str);
2383 if (scriptOrURL.startsWith(str)) {2383 if (scriptOrURL.startsWith(str)) {
2384 isInWhitelist = true;2384 isInWhitelist = true;
2385 qCDebug(scriptengine) << "Script approved.";
2385 break; // bail early since we found a match2386 break; // bail early since we found a match
2386 }2387 }
2387 }2388 }