Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 6 files). Show all
Unified · Split
| @@ -187,7 +187,7 @@ void inputControllerFromScriptValue(const QScriptValue &object, controller::Inpu · 186 unmodified lines | |||
| 187 | // | 187 | // |
| 188 | // Extract the url portion of a url that has been encoded with encodeEntityIdIntoEntityUrl(...) | 188 | // Extract the url portion of a url that has been encoded with encodeEntityIdIntoEntityUrl(...) |
| 189 | QString extractUrlFromEntityUrl(const QString& url) { | 189 | QString extractUrlFromEntityUrl(const QString& url) { |
| 190 | auto parts = url.split(' ', QString::SkipEmptyParts); | 190 | auto parts = url.split(' ', Qt::SkipEmptyParts); |
| 191 | if (parts.length() > 0) { | 191 | if (parts.length() > 0) { |
| 192 | return parts[0]; | 192 | return parts[0]; |
| 193 | } else { | 193 | } else { |
| @@ -2386,7 +2386,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2192 unmodified lines | |||
| 2386 | bool passList = false; // assume unsafe | 2386 | bool passList = false; // assume unsafe |
| 2387 | QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]"; | 2387 | QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]"; |
| 2388 | QList<QString> safeURLPrefixes = { "file:///", "atp:", "cache:" }; | 2388 | QList<QString> safeURLPrefixes = { "file:///", "atp:", "cache:" }; |
| 2389 | safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); | 2389 | safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts); |
| 2390 | 2390 | ||
| 2391 | // Entity Script Whitelist toggle check. | 2391 | // Entity Script Whitelist toggle check. |
| 2392 | Setting::Handle<bool> whitelistEnabled {"private/whitelistEnabled", false }; | 2392 | Setting::Handle<bool> whitelistEnabled {"private/whitelistEnabled", false }; |
| @@ -2397,7 +2397,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 4 unmodified lines | |||
| 2397 | 2397 | ||
| 2398 | // Pull SAFEURLS from the Interface.JSON settings. | 2398 | // Pull SAFEURLS from the Interface.JSON settings. |
| 2399 | QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); | 2399 | QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); |
| 2400 | QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), QString::SkipEmptyParts); | 2400 | QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), Qt::SkipEmptyParts); |
| 2401 | safeURLPrefixes += settingsSafeURLS; | 2401 | safeURLPrefixes += settingsSafeURLS; |
| 2402 | // END Pull SAFEURLS from the Interface.JSON settings. | 2402 | // END Pull SAFEURLS from the Interface.JSON settings. |
| 2403 | 2403 | ||