diff --git a/.gitignore b/.gitignore index 137dcf547a..eda070a59d 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,6 @@ result-* # Webgui sync script helpers web/scripts/.sync-webgui-repo-* + +# Activation code data +plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/data/activation-data.php \ No newline at end of file diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/data/activation-data.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/data/activation-data.php deleted file mode 100644 index ada94ff777..0000000000 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/data/activation-data.php +++ /dev/null @@ -1,10 +0,0 @@ - -
- $activationCodeExtractor->debug(); ?> -diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/activation-code-extractor.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/activation-code-extractor.php index e4d205ad1f..53b91c016a 100644 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/activation-code-extractor.php +++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/activation-code-extractor.php @@ -153,8 +153,6 @@ public function getPartnerUrl(): string { /** * Output for debugging - * - * @see https://tower.local/plugins/dynamix.my.servers/data/activation-data.php * @return void */ public function debug(): void { diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php index b6d232b6dc..f4d68fbcf6 100644 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php +++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php @@ -13,7 +13,9 @@ public function __construct() {} private function findManifestFiles(string $manifestName): array { $basePath = '/usr/local/emhttp' . self::PREFIXED_PATH; - $command = "find {$basePath} -name {$manifestName}"; + $escapedBasePath = escapeshellarg($basePath); + $escapedManifestName = escapeshellarg($manifestName); + $command = "find {$escapedBasePath} -name {$escapedManifestName}"; exec($command, $files); return $files; } diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/scripts/activation_code_remove b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/scripts/activation_code_remove index 627398b88a..46ee05a0f1 100755 --- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/scripts/activation_code_remove +++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/scripts/activation_code_remove @@ -128,7 +128,6 @@ if [[ -f "$ACTIVATION_SETUP_FLAG" ]]; then if [[ $DRY_RUN == false ]]; then debug_echo "Deleting activation code related setup and php files" FILES_TO_DELETE=( - "/usr/local/emhttp/plugins/dynamix.my.servers/data/activation-data.php" "/usr/local/emhttp/plugins/dynamix.my.servers/include/activation-code-extractor.php" "/usr/local/emhttp/plugins/dynamix.my.servers/include/partner-logo.php" "/usr/local/emhttp/plugins/dynamix.my.servers/include/welcome-modal.php"