Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve escaping on the web interface #2851

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 18, 2023

What does this implement/fix?

Fixes pi-hole/FTL#1760, see pi-hole/FTL#1760 (comment) for additional context.

Before:
Screenshot from 2023-11-18 12-34-46

After:
Screenshot from 2023-11-18 12-48-03

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@DL6ER DL6ER requested a review from a team November 18, 2023 11:56
@yubiuser
Copy link
Member

yubiuser commented Nov 18, 2023

Interesting, that setting the content type works for us, but not for some users reported here: https://bugs.jquery.com/ticket/12326/

@DL6ER DL6ER force-pushed the tweak/contentType branch from ead31e2 to a39c8a5 Compare November 18, 2023 21:38
@DL6ER DL6ER mentioned this pull request Nov 19, 2023
5 tasks
@DL6ER DL6ER changed the title Explicitly set contentType to avoid promotion to jsonp Improve escaping on the web interface Nov 19, 2023
@DL6ER
Copy link
Member Author

DL6ER commented Nov 19, 2023

The small glitch I observed isn't a web issue. It will be fixed by pi-hole/FTL#1763 so I'd say this PR is indeed ready for review.


Interesting, that the setting the content type works for us, but not for some users reported here: https://bugs.jquery.com/ticket/12326/

These last comments you are referring to are over 9 years old, though. I guess the issue was fixed meanwhile but just nobody remembered this issue ticket (it is "closed as invalid").

rdwebdesign
rdwebdesign previously approved these changes Nov 20, 2023
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

Conflicts have been resolved.

@DL6ER DL6ER requested a review from yubiuser November 20, 2023 18:52
@DL6ER DL6ER merged commit 42395e1 into development-v6 Nov 21, 2023
7 checks passed
@DL6ER DL6ER deleted the tweak/contentType branch November 21, 2023 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants