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

Add delete button to message table #1886

Merged
merged 5 commits into from Sep 27, 2021
Merged

Add delete button to message table #1886

merged 5 commits into from Sep 27, 2021

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Sep 12, 2021

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Adds a delete button to the message table

Follow-up PR of #1860

Needs to be merged together with #1886 and pi-hole/pi-hole#4328

Bildschirmfoto zu 2021-09-13 19-39-40
Bildschirmfoto zu 2021-09-13 19-39-45

yubiuser and others added 5 commits September 12, 2021 19:41
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: yubiuser <ckoenig@posteo.de>
@DL6ER
Copy link
Member

DL6ER commented Sep 26, 2021

I tried this just now and got
Screenshot from 2021-09-26 16-50-06

error.log says:

2021-09-26 16:50:08: (mod_fastcgi.c.421) FastCGI-stderr: PHP Warning:  parse_ini_file(/etc/pihole/setupVars.conf): failed to open stream: Permission denied in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 33
2021-09-26 16:50:08: (mod_fastcgi.c.421) FastCGI-stderr: PHP Warning:  parse_ini_file(/etc/pihole/pihole-FTL.conf): failed to open stream: Permission denied in /var/www/html/admin/scripts/pi-hole/php/database.php on line 26

Permissions:

$ ls -lh /etc | grep pihole
drw-rw-r-- 4 pihole pihole    4.0K Sep 26 16:49 pihole

$ ls -lh /etc/pihole | grep pihole-FTL.db
-rw-rw-r-- 1 pihole pihole 598M Sep 26 16:49 pihole-FTL.db

Interestingly enough, I am missing x on /etc/pihole This may be self-inflicted pain due to some failed experiment, I don't know.

After having fixed this, deleting a message worked perfectly fine.


@yubiuser Could you verify permissions for /etc/pihole are drwxrwxr-x on a normal install of the current development branches? I'm fine with merging this when we find that this issue was isolated to my Pi-hole.

@yubiuser
Copy link
Member Author

On a fresh Debian Buster

debian@debian:~$ ls -ls /etc |grep pihole
4 drwxrwxr-x  3 pihole pihole  4096 27. Sep 07:19 pihole

-rw-r--r-- 1 pihole pihole  52K 27. Sep 07:20 pihole-FTL.db

After checking out development

  Current Pi-hole version is development v5.4-10-g841222f
  Current AdminLTE version is devel v5.6-20-ge3a69af
  Current FTL version is development vDev-5ab7bf7

debian@debian:~$ ls -ls /etc |grep pihole
4 drwxrwxr-x  3 pihole pihole  4096 27. Sep 07:22 pihole
-rw-rw-r-- 1 pihole pihole  52K 27. Sep 07:22 pihole-FTL.db

@DL6ER DL6ER merged commit 8de314f into pi-hole:devel Sep 27, 2021
@yubiuser yubiuser deleted the delete_messages2 branch September 27, 2021 07:47
@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-diagnosis-overview-webinterface/49995/2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Code Review Required Open Pull Request, needs code reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants