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

Adding option to show all results for queryads #2487

Merged
merged 4 commits into from Jan 14, 2023
Merged

Conversation

rdwebdesign
Copy link
Member

What does this PR aim to accomplish?

Fix #2486

Allow unlimited results on the Tools > Search Adlists page.
Also change the message when more than 100 domains are returned.

How does this PR accomplish the above?

Adding code and a checkbox to allow unlimited results.

Link documentation PRs if any are needed to support this PR:

none


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 and I have tested my changes.
  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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@rdwebdesign rdwebdesign force-pushed the queryads_all branch 2 times, most recently from af647d6 to 3f026f7 Compare January 11, 2023 04:48
@rdwebdesign rdwebdesign requested a review from a team January 11, 2023 04:51
@yubiuser yubiuser linked an issue Jan 11, 2023 that may be closed by this pull request
@rdwebdesign rdwebdesign added the PR: Code Review Required Open Pull Request, needs code reviewed label Jan 11, 2023
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not working. The URL construction fails at some place. When allis checked the URL looks like

http://pi.hole/admin/scripts/pi-hole/php/queryads.php?domain=flurry.com& but it should be http://pi.hole/admin/scripts/pi-hole/php/queryads.php?domain=flurry.com&showall

(The latter is working fine)

scripts/pi-hole/php/queryads.php Outdated Show resolved Hide resolved
@yubiuser
Copy link
Member

-bp was removed here: pi-hole/pi-hole@e35a9da

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the while "quiet" stuff can go as well. It was added by PR #222 as a way to show on which adlist a domain is on at the now removed blocking page

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
- "quiet" option and related functions (used by blocking page);
- "adlist" option (used by blocking page).

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign rdwebdesign removed the PR: Code Review Required Open Pull Request, needs code reviewed label Jan 14, 2023
@rdwebdesign rdwebdesign merged commit 854e7e9 into devel Jan 14, 2023
@rdwebdesign rdwebdesign deleted the queryads_all branch January 14, 2023 02:09
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-20-1-web-v5-18-1-and-core-v5-15-released/60495/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Search with more then 100 results
3 participants