From 8ef3ad2c5e90f85ea773dcf28706b92992e99f5e Mon Sep 17 00:00:00 2001 From: Joost de Valk Date: Sun, 15 Nov 2026 11:10:03 +0100 Subject: [PATCH 1/7] Restrict analytics tracking and harden settings and releases --- .distignore | 18 ++++++ .github/workflows/release.yml | 58 +++++++++++------- .github/workflows/tests.yml | 19 +++--- resources/css/settings.css | 2 - simple-analytics.php | 3 +- src/Actions/Action.php | 2 + src/Actions/AddInactiveComment.php | 2 + src/Actions/AddNoScriptTag.php | 7 ++- src/Actions/AddPluginSettingsLink.php | 2 + src/Plugin.php | 12 +++- src/ScriptRegistry.php | 2 + src/Scripts/AnalyticsScript.php | 5 +- src/Scripts/AutomatedEventsScript.php | 5 +- src/Scripts/Contracts/HasAttributes.php | 2 + src/Scripts/Contracts/HideScriptId.php | 2 + src/Scripts/Contracts/Script.php | 2 + src/Scripts/InactiveScript.php | 2 + src/Setting.php | 2 + src/SettingName.php | 5 ++ src/Settings/AdminPage.php | 2 + src/Settings/Block.php | 2 + src/Settings/Blocks/CalloutBlock.php | 2 + src/Settings/Blocks/Fields/Checkbox.php | 2 + src/Settings/Blocks/Fields/Checkboxes.php | 2 + src/Settings/Blocks/Fields/Field.php | 2 + src/Settings/Blocks/Fields/Input.php | 6 ++ src/Settings/Blocks/Fields/IpList.php | 2 + src/Settings/Concerns/HasDocs.php | 2 + src/Settings/Concerns/HasPlaceholder.php | 2 + src/Settings/Concerns/ManagesBlocks.php | 2 + .../Concerns/WordPressPageIntegration.php | 2 + src/Settings/Tab.php | 2 + src/Support/CustomDomain.php | 56 +++++++++++++++++ src/Support/OnloadCallback.php | 2 + src/Support/Str.php | 2 + src/Support/SvgIcon.php | 2 + src/TrackingRules.php | 7 +++ src/UI/LabelComponent.php | 2 + src/UI/PageLayoutComponent.php | 7 ++- src/UI/TabListComponent.php | 8 ++- src/WordPressHooks.php | 2 + src/WordPressSettings.php | 2 + tailwind.config.js | 2 +- tests/Browser/pluginSettings.spec.ts | 48 +++++++++++++++ tests/Regression/custom-domain.php | 60 +++++++++++++++++++ tests/Regression/deactivation.php | 2 + tests/Regression/ip-sanitization.php | 2 + tests/Regression/onload-permissions.php | 2 + tests/Regression/settings-ui.php | 29 +++++++++ tests/Regression/tracking-boundaries.php | 55 +++++++++++++++++ tests/Support/isolated-options.php | 2 + 51 files changed, 428 insertions(+), 46 deletions(-) create mode 100644 src/Support/CustomDomain.php create mode 100644 tests/Regression/custom-domain.php create mode 100644 tests/Regression/settings-ui.php create mode 100644 tests/Regression/tracking-boundaries.php diff --git a/.distignore b/.distignore index aa8df5b..7259877 100644 --- a/.distignore +++ b/.distignore @@ -14,3 +14,21 @@ composer.lock package.json pnpm-lock.yaml release.sh + +/tests +/scripts +/bin +/test-results +/playwright-report +/blob-report +Caddyfile +rector.php +.wp-env*.json +playwright.config.* +tailwind.config.* +pnpm-workspace.yaml +.editorconfig +.prettierrc.json +README.md +AGENTS.md +CLAUDE.md diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41d1983..3a9fc82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,14 @@ name: Release on: - schedule: - - cron: "0 8 * * 1" # At 08:00 on Monday. - workflow_dispatch: # Allows manual triggering + workflow_dispatch: # Releases require an explicit manual trigger on main. + +concurrency: + group: wordpress-release + cancel-in-progress: false + +permissions: + contents: read jobs: e2e: @@ -11,6 +16,7 @@ jobs: update: name: Update version + if: github.ref == 'refs/heads/main' needs: e2e runs-on: ubuntu-latest timeout-minutes: 10 @@ -20,7 +26,7 @@ jobs: steps: - name: Create release app token id: release-app - uses: actions/create-github-app-token@v3 + uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3 with: client-id: ${{ vars.RELEASE_APP_CLIENT_ID }} private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }} @@ -30,10 +36,11 @@ jobs: id: release-app-user env: GH_TOKEN: ${{ steps.release-app.outputs.token }} - run: echo "user-id=$(gh api "/users/${{ steps.release-app.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT" + APP_SLUG: ${{ steps.release-app.outputs.app-slug }} + run: echo "user-id=$(gh api "/users/${APP_SLUG}[bot]" --jq .id)" >> "$GITHUB_OUTPUT" - name: Check out repository - uses: actions/checkout@v6 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 with: token: ${{ steps.release-app.outputs.token }} persist-credentials: true # Required to push the release commit as the app @@ -41,29 +48,30 @@ jobs: fetch-tags: true # Ensure tags are fetched - name: Install pnpm - uses: pnpm/action-setup@v5 + uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5 with: version: 10 - name: Install Node.js LTS - uses: actions/setup-node@v6 + uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6 with: node-version: lts/* cache: "pnpm" - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build assets run: pnpm build - name: Install PHP - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # v2 with: php-version: "latest" + tools: composer:v2 - - name: Install Composer - uses: ramsey/composer-install@v4 + - name: Install Composer dependencies + run: composer install --no-interaction --prefer-dist --no-progress - name: Downgrade PHP code to the minimum version WordPress requires run: vendor/bin/rector --ansi @@ -83,18 +91,23 @@ jobs: - name: Commit and push changes if: steps.script.outputs.has-changed == 'true' + env: + RELEASE_NAME: ${{ steps.script.outputs.release-name }} + RELEASE_REF: ${{ github.ref_name }} + APP_SLUG: ${{ steps.release-app.outputs.app-slug }} + APP_USER_ID: ${{ steps.release-app-user.outputs.user-id }} run: | - git config user.name "${{ steps.release-app.outputs.app-slug }}[bot]" - git config user.email "${{ steps.release-app-user.outputs.user-id }}+${{ steps.release-app.outputs.app-slug }}[bot]@users.noreply.github.com" + git config user.name "${APP_SLUG}[bot]" + git config user.email "${APP_USER_ID}+${APP_SLUG}[bot]@users.noreply.github.com" git add . - git commit -m "${{ steps.script.outputs.release-name }}" - # Push changes, handling potential conflicts - git push || git pull --rebase origin ${{ github.ref_name }} && git push + git commit -m "$RELEASE_NAME" + # Stop if main changed instead of deploying an untested rebase. + git push origin "HEAD:$RELEASE_REF" - name: WordPress Plugin Deploy if: steps.script.outputs.has-changed == 'true' id: deploy - uses: 10up/action-wordpress-plugin-deploy@2.3.0 + uses: 10up/action-wordpress-plugin-deploy@54bd289b8525fd23a5c365ec369185f2966529c2 # 2.3.0 with: generate-zip: true env: @@ -107,13 +120,16 @@ jobs: - name: Name release zip like repository if: steps.script.outputs.has-changed == 'true' id: release_zip + env: + ZIP_PATH: ${{ steps.deploy.outputs.zip-path }} + REPOSITORY_NAME: ${{ github.event.repository.name }} run: | - cp "${{ steps.deploy.outputs.zip-path }}" "${{ github.workspace }}/${{ github.event.repository.name }}.zip" - echo "path=${{ github.workspace }}/${{ github.event.repository.name }}.zip" >> "$GITHUB_OUTPUT" + cp -- "$ZIP_PATH" "$GITHUB_WORKSPACE/$REPOSITORY_NAME.zip" + echo "path=$GITHUB_WORKSPACE/$REPOSITORY_NAME.zip" >> "$GITHUB_OUTPUT" - name: Create GitHub release if: steps.script.outputs.has-changed == 'true' - uses: softprops/action-gh-release@v3 + uses: softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3 with: tag_name: ${{ steps.script.outputs.stable-tag }} name: ${{ steps.script.outputs.release-name }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9de793f..5e57506 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,6 +11,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: prepare-matrix: name: Prepare test matrix @@ -19,7 +22,7 @@ jobs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - name: Checkout plugin - uses: actions/checkout@v6 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 with: persist-credentials: false @@ -43,27 +46,27 @@ jobs: steps: - name: Checkout plugin - uses: actions/checkout@v6 + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 with: persist-credentials: false - name: Install pnpm - uses: pnpm/action-setup@v6 + uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6 with: version: 10 - name: Setup Node - uses: actions/setup-node@v6 + uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6 with: node-version: lts/* cache: "pnpm" - name: Install pnpm dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Restore Playwright browsers cache id: playwright-cache - uses: actions/cache/restore@v5 + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 with: path: ~/.cache/ms-playwright key: ${{ runner.os }}-playwright-${{ hashFiles('pnpm-lock.yaml') }} @@ -108,7 +111,7 @@ jobs: - name: Save Playwright browsers cache if: steps.playwright-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@v5 + uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 continue-on-error: true with: path: ~/.cache/ms-playwright @@ -119,7 +122,7 @@ jobs: - name: Upload test results if: always() - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7 with: name: test-results-php${{ matrix.php }}-wp${{ matrix.wp }} path: test-results diff --git a/resources/css/settings.css b/resources/css/settings.css index b63e5db..b5c61c9 100644 --- a/resources/css/settings.css +++ b/resources/css/settings.css @@ -1,5 +1,3 @@ -@import url(https://fonts.bunny.net/css?family=space-grotesk:500,600); - @tailwind base; @tailwind components; @tailwind utilities; diff --git a/simple-analytics.php b/simple-analytics.php index 1321b59..94e3477 100644 --- a/simple-analytics.php +++ b/simple-analytics.php @@ -49,6 +49,7 @@ require __DIR__ . '/src/Actions/AddPluginSettingsLink.php'; require __DIR__ . '/src/Support/Str.php'; require __DIR__ . '/src/Support/OnloadCallback.php'; +require __DIR__ . '/src/Support/CustomDomain.php'; require __DIR__ . '/src/Settings/Block.php'; require __DIR__ . '/src/Settings/Blocks/CalloutBlock.php'; require __DIR__ . '/src/Settings/Concerns/HasDocs.php'; @@ -104,7 +105,7 @@ $tab->input(SettingName::CUSTOM_DOMAIN, 'Custom Domain') ->placeholder('Enter your custom domain or leave it empty.') - ->description('E.g. api.example.com. Leave empty to use the default domain (most users).') + ->description('E.g. api.example.com, without a URL scheme or path. Requires permission to save unfiltered HTML. After upgrading, save an existing custom domain again to enable it. Leave empty to use the default domain.') ->docs('https://docs.simpleanalytics.com/bypass-ad-blockers'); $tab->checkbox(SettingName::COLLECT_DNT, 'Collect Do Not Track') diff --git a/src/Actions/Action.php b/src/Actions/Action.php index ba3a02f..8e3f12f 100644 --- a/src/Actions/Action.php +++ b/src/Actions/Action.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Actions; +defined('ABSPATH') || exit; + trait Action { protected function hook(): string diff --git a/src/Actions/AddInactiveComment.php b/src/Actions/AddInactiveComment.php index 4d91ca2..be18093 100644 --- a/src/Actions/AddInactiveComment.php +++ b/src/Actions/AddInactiveComment.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Actions; +defined('ABSPATH') || exit; + class AddInactiveComment { use Action; diff --git a/src/Actions/AddNoScriptTag.php b/src/Actions/AddNoScriptTag.php index 71832ab..fbb0d8c 100644 --- a/src/Actions/AddNoScriptTag.php +++ b/src/Actions/AddNoScriptTag.php @@ -2,8 +2,9 @@ namespace SimpleAnalytics\Actions; -use SimpleAnalytics\Setting; -use SimpleAnalytics\SettingName; +defined('ABSPATH') || exit; + +use SimpleAnalytics\Support\CustomDomain; class AddNoScriptTag { @@ -21,6 +22,6 @@ public function handle(): void public function getCustomDomain(): string { - return esc_url('https://' . Setting::get(SettingName::CUSTOM_DOMAIN, 'queue.simpleanalyticscdn.com') . '/noscript.gif'); + return esc_url('https://' . CustomDomain::get('queue.simpleanalyticscdn.com') . '/noscript.gif'); } } diff --git a/src/Actions/AddPluginSettingsLink.php b/src/Actions/AddPluginSettingsLink.php index 664b469..ac1f6b3 100644 --- a/src/Actions/AddPluginSettingsLink.php +++ b/src/Actions/AddPluginSettingsLink.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Actions; +defined('ABSPATH') || exit; + use const SimpleAnalytics\PLUGIN_BASENAME; /** diff --git a/src/Plugin.php b/src/Plugin.php index 73313e2..a2b27f9 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics; +defined('ABSPATH') || exit; + use SimpleAnalytics\Actions\AddInactiveComment; use SimpleAnalytics\Actions\AddNoScriptTag; use SimpleAnalytics\Actions\AddPluginSettingsLink; @@ -34,7 +36,7 @@ public function __construct( public function boot(): void { - $this->hooks->addAction('init', \Closure::fromCallable([$this, 'onInit'])); + $this->hooks->addAction('wp_enqueue_scripts', \Closure::fromCallable([$this, 'enqueueScripts'])); $this->hooks->onActivation(\Closure::fromCallable([$this, 'onActivation'])); if ($this->hooks->isAdmin()) { @@ -43,8 +45,12 @@ public function boot(): void } } - public function onInit(): void + public function enqueueScripts(): void { + if ($this->hooks->isAdmin() || ($GLOBALS['pagenow'] ?? '') === 'wp-login.php') { + return; + } + $hasExcludedIp = $this->trackingRules->hasExcludedIp(); $hasExcludedUserRole = $this->trackingRules->hasExcludedUserRole(); $tracking = ! $hasExcludedIp && ! $hasExcludedUserRole; @@ -61,7 +67,7 @@ public function onInit(): void AddNoScriptTag::register(); } - if ($this->settings->boolean(SettingName::AUTOMATED_EVENTS)) { + if ($tracking && $this->settings->boolean(SettingName::AUTOMATED_EVENTS)) { $this->scripts->push(new AutomatedEventsScript); } diff --git a/src/ScriptRegistry.php b/src/ScriptRegistry.php index 7dfe61d..e51f349 100644 --- a/src/ScriptRegistry.php +++ b/src/ScriptRegistry.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics; +defined('ABSPATH') || exit; + use SimpleAnalytics\Scripts\Contracts\HasAttributes; use SimpleAnalytics\Scripts\Contracts\HideScriptId; use SimpleAnalytics\Scripts\Contracts\Script; diff --git a/src/Scripts/AnalyticsScript.php b/src/Scripts/AnalyticsScript.php index 271235b..4a9fb1a 100644 --- a/src/Scripts/AnalyticsScript.php +++ b/src/Scripts/AnalyticsScript.php @@ -2,18 +2,21 @@ namespace SimpleAnalytics\Scripts; +defined('ABSPATH') || exit; + use SimpleAnalytics\Scripts\Contracts\HasAttributes; use SimpleAnalytics\Scripts\Contracts\HideScriptId; use SimpleAnalytics\Scripts\Contracts\Script; use SimpleAnalytics\Setting; use SimpleAnalytics\SettingName; +use SimpleAnalytics\Support\CustomDomain; use SimpleAnalytics\Support\OnloadCallback; class AnalyticsScript implements Script, HasAttributes, HideScriptId { public function path(): string { - return sprintf("https://%s/latest.js", Setting::get(SettingName::CUSTOM_DOMAIN, 'scripts.simpleanalyticscdn.com')); + return sprintf("https://%s/latest.js", CustomDomain::get('scripts.simpleanalyticscdn.com')); } public function handle(): string diff --git a/src/Scripts/AutomatedEventsScript.php b/src/Scripts/AutomatedEventsScript.php index 5688986..87d17b2 100644 --- a/src/Scripts/AutomatedEventsScript.php +++ b/src/Scripts/AutomatedEventsScript.php @@ -2,17 +2,20 @@ namespace SimpleAnalytics\Scripts; +defined('ABSPATH') || exit; + use SimpleAnalytics\Scripts\Contracts\HasAttributes; use SimpleAnalytics\Scripts\Contracts\HideScriptId; use SimpleAnalytics\Scripts\Contracts\Script; use SimpleAnalytics\Setting; use SimpleAnalytics\SettingName; +use SimpleAnalytics\Support\CustomDomain; class AutomatedEventsScript implements Script, HasAttributes, HideScriptId { public function path(): string { - return sprintf("https://%s/auto-events.js", Setting::get(SettingName::CUSTOM_DOMAIN, 'scripts.simpleanalyticscdn.com')); + return sprintf("https://%s/auto-events.js", CustomDomain::get('scripts.simpleanalyticscdn.com')); } public function handle(): string diff --git a/src/Scripts/Contracts/HasAttributes.php b/src/Scripts/Contracts/HasAttributes.php index 1c2bb90..58f8eb7 100644 --- a/src/Scripts/Contracts/HasAttributes.php +++ b/src/Scripts/Contracts/HasAttributes.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Scripts\Contracts; +defined('ABSPATH') || exit; + interface HasAttributes { public function attributes(): array; diff --git a/src/Scripts/Contracts/HideScriptId.php b/src/Scripts/Contracts/HideScriptId.php index 0e6998a..836b2f9 100644 --- a/src/Scripts/Contracts/HideScriptId.php +++ b/src/Scripts/Contracts/HideScriptId.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Scripts\Contracts; +defined('ABSPATH') || exit; + interface HideScriptId { } diff --git a/src/Scripts/Contracts/Script.php b/src/Scripts/Contracts/Script.php index 1d710e4..552caba 100644 --- a/src/Scripts/Contracts/Script.php +++ b/src/Scripts/Contracts/Script.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Scripts\Contracts; +defined('ABSPATH') || exit; + interface Script { public function path(): string; diff --git a/src/Scripts/InactiveScript.php b/src/Scripts/InactiveScript.php index b9cb74f..bd82318 100644 --- a/src/Scripts/InactiveScript.php +++ b/src/Scripts/InactiveScript.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Scripts; +defined('ABSPATH') || exit; + use SimpleAnalytics\Scripts\Contracts\Script; use const SimpleAnalytics\PLUGIN_URL; diff --git a/src/Setting.php b/src/Setting.php index c6d66f2..17052c0 100644 --- a/src/Setting.php +++ b/src/Setting.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics; +defined('ABSPATH') || exit; + class Setting { /** diff --git a/src/SettingName.php b/src/SettingName.php index b1cc789..d3a0ee9 100644 --- a/src/SettingName.php +++ b/src/SettingName.php @@ -13,6 +13,11 @@ class SettingName * @var string */ const CUSTOM_DOMAIN = 'simpleanalytics_custom_domain'; + /** + * Private approval recorded when an authorized user saves a custom domain. + * @var string + */ + const CUSTOM_DOMAIN_HASH = 'simpleanalytics_custom_domain_hash'; /** * @var string */ diff --git a/src/Settings/AdminPage.php b/src/Settings/AdminPage.php index 22c6058..5fb371e 100644 --- a/src/Settings/AdminPage.php +++ b/src/Settings/AdminPage.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\Concerns\WordPressPageIntegration; use SimpleAnalytics\Support\Str; diff --git a/src/Settings/Block.php b/src/Settings/Block.php index 49aef3a..ddad45f 100644 --- a/src/Settings/Block.php +++ b/src/Settings/Block.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings; +defined('ABSPATH') || exit; + interface Block { public function render(): void; diff --git a/src/Settings/Blocks/CalloutBlock.php b/src/Settings/Blocks/CalloutBlock.php index fa63b8c..5017f35 100644 --- a/src/Settings/Blocks/CalloutBlock.php +++ b/src/Settings/Blocks/CalloutBlock.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Blocks; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\Block; use function SimpleAnalytics\get_icon; diff --git a/src/Settings/Blocks/Fields/Checkbox.php b/src/Settings/Blocks/Fields/Checkbox.php index 9595e0d..d873b7c 100644 --- a/src/Settings/Blocks/Fields/Checkbox.php +++ b/src/Settings/Blocks/Fields/Checkbox.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Blocks\Fields; +defined('ABSPATH') || exit; + use SimpleAnalytics\Setting; use SimpleAnalytics\Settings\Concerns\HasDocs; use SimpleAnalytics\UI\LabelComponent; diff --git a/src/Settings/Blocks/Fields/Checkboxes.php b/src/Settings/Blocks/Fields/Checkboxes.php index d22a7f9..eaef0b6 100644 --- a/src/Settings/Blocks/Fields/Checkboxes.php +++ b/src/Settings/Blocks/Fields/Checkboxes.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Blocks\Fields; +defined('ABSPATH') || exit; + use Closure; use SimpleAnalytics\Setting; use SimpleAnalytics\Settings\Concerns\HasDocs; diff --git a/src/Settings/Blocks/Fields/Field.php b/src/Settings/Blocks/Fields/Field.php index 0b2d223..cc9a882 100644 --- a/src/Settings/Blocks/Fields/Field.php +++ b/src/Settings/Blocks/Fields/Field.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Blocks\Fields; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\Block; abstract class Field implements Block diff --git a/src/Settings/Blocks/Fields/Input.php b/src/Settings/Blocks/Fields/Input.php index 93705ca..530d0d1 100644 --- a/src/Settings/Blocks/Fields/Input.php +++ b/src/Settings/Blocks/Fields/Input.php @@ -2,9 +2,12 @@ namespace SimpleAnalytics\Settings\Blocks\Fields; +defined('ABSPATH') || exit; + use SimpleAnalytics\Setting; use SimpleAnalytics\SettingName; use SimpleAnalytics\Support\OnloadCallback; +use SimpleAnalytics\Support\CustomDomain; use SimpleAnalytics\Settings\Concerns\HasDocs; use SimpleAnalytics\Settings\Concerns\HasPlaceholder; use SimpleAnalytics\UI\LabelComponent; @@ -34,6 +37,9 @@ public function getValueSanitizer(): callable if ($this->getKey() === SettingName::ONLOAD_CALLBACK) { return [OnloadCallback::class, 'sanitize']; } + if ($this->getKey() === SettingName::CUSTOM_DOMAIN) { + return [CustomDomain::class, 'sanitize']; + } return 'sanitize_text_field'; } diff --git a/src/Settings/Blocks/Fields/IpList.php b/src/Settings/Blocks/Fields/IpList.php index ceb34e0..77000d0 100644 --- a/src/Settings/Blocks/Fields/IpList.php +++ b/src/Settings/Blocks/Fields/IpList.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Blocks\Fields; +defined('ABSPATH') || exit; + use SimpleAnalytics\Setting; use SimpleAnalytics\Settings\Concerns\HasDocs; use SimpleAnalytics\Settings\Concerns\HasPlaceholder; diff --git a/src/Settings/Concerns/HasDocs.php b/src/Settings/Concerns/HasDocs.php index cad8b8c..eba7a41 100644 --- a/src/Settings/Concerns/HasDocs.php +++ b/src/Settings/Concerns/HasDocs.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Concerns; +defined('ABSPATH') || exit; + trait HasDocs { /** diff --git a/src/Settings/Concerns/HasPlaceholder.php b/src/Settings/Concerns/HasPlaceholder.php index 750a3ed..19ad479 100644 --- a/src/Settings/Concerns/HasPlaceholder.php +++ b/src/Settings/Concerns/HasPlaceholder.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Concerns; +defined('ABSPATH') || exit; + trait HasPlaceholder { /** diff --git a/src/Settings/Concerns/ManagesBlocks.php b/src/Settings/Concerns/ManagesBlocks.php index 87b0517..4603b69 100644 --- a/src/Settings/Concerns/ManagesBlocks.php +++ b/src/Settings/Concerns/ManagesBlocks.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Concerns; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\Block; use SimpleAnalytics\Settings\Blocks\CalloutBlock; use SimpleAnalytics\Settings\Blocks\Fields\Checkbox; diff --git a/src/Settings/Concerns/WordPressPageIntegration.php b/src/Settings/Concerns/WordPressPageIntegration.php index 391d7a1..beefe9d 100644 --- a/src/Settings/Concerns/WordPressPageIntegration.php +++ b/src/Settings/Concerns/WordPressPageIntegration.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings\Concerns; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\Blocks\Fields\Field; use SimpleAnalytics\Settings\Tab; use SimpleAnalytics\UI\PageLayoutComponent; diff --git a/src/Settings/Tab.php b/src/Settings/Tab.php index 04a1d15..45666be 100644 --- a/src/Settings/Tab.php +++ b/src/Settings/Tab.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\Settings; +defined('ABSPATH') || exit; + use SimpleAnalytics\Support\SvgIcon; class Tab diff --git a/src/Support/CustomDomain.php b/src/Support/CustomDomain.php new file mode 100644 index 0000000..f6f5ece --- /dev/null +++ b/src/Support/CustomDomain.php @@ -0,0 +1,56 @@ +settings->array(SettingName::EXCLUDED_ROLES); if ($needle === []) { diff --git a/src/UI/LabelComponent.php b/src/UI/LabelComponent.php index 8cb6272..b72c158 100644 --- a/src/UI/LabelComponent.php +++ b/src/UI/LabelComponent.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\UI; +defined('ABSPATH') || exit; + use SimpleAnalytics\Support\Str; class LabelComponent diff --git a/src/UI/PageLayoutComponent.php b/src/UI/PageLayoutComponent.php index 586d108..4570e4b 100644 --- a/src/UI/PageLayoutComponent.php +++ b/src/UI/PageLayoutComponent.php @@ -2,6 +2,8 @@ namespace SimpleAnalytics\UI; +defined('ABSPATH') || exit; + use SimpleAnalytics\Settings\{AdminPage, Tab}; use function SimpleAnalytics\get_icon; use const SimpleAnalytics\PLUGIN_URL; @@ -35,7 +37,6 @@ public function __invoke(): void }