[PATCH 1/2] urlfilterctrl: Fix bug#10649 - add option to remove urlfilter from fcron directories

[PATCH 1/2] urlfilterctrl: Fix bug#10649 - add option to remove urlfilter from fcron directories

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]

- Currently if the urlfilter update is enabled then autoupdate.pl is renamed urlfilter and
   added into either the daily, weekly or monthly fcron directoiries. If the update is
   disabled then the urlfilter update script stays in the directory and is not removed.
- This patch adds in the option of remove to the urlfilterctrl program. The first part
   of the urlfilterctrl.c code removes any existing symlinks so all that needs to be done
   for the remove option is to not add any symlinks to the fcron directories.
- Confirmed in a vm testbed that the current approach leaves the symlink in place. Installed
   the changes from this and the previous patch and confirmed that when the url update is
   disabled the symlink is removed.

Fixes: Bug#10649
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 src/misc-progs/urlfilterctrl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/misc-progs/urlfilterctrl.c b/src/misc-progs/urlfilterctrl.c
index 28dc03075..a11d6d041 100644
--- a/src/misc-progs/urlfilterctrl.c
+++ b/src/misc-progs/urlfilterctrl.c
@@ -24,6 +24,8 @@ int main(int argc, char *argv[]){
 			safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.weekly/urlfilter");
 		} else if (strcmp(argv[2], "monthly") == 0){
 			safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.monthly/urlfilter");
+		} else if (strcmp(argv[2], "remove") == 0){
+			// Don't add urlfilter into any fcron directory
 		}else{
 			printf("invalid parameter(s)\n");
 		return(1);
-- 
2.42.0

[PATCH 2/2] urlfilter.cgi: Fixes bug#10649 - calls urlfilterctrl with remove option if update disabled

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]

- When the url filter update enable checkbox is unchecked then this patch calls
   urlfilterctrl with the remove option added in the otrher patch of this series.
- Tested on my vm testbed that this change does remove the urlfilter symlink from the
   fcron directories when the update is disabled.

Fixes: Bug#10649
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/urlfilter.cgi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 1e54372f1..1ced06e26 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -982,6 +982,11 @@ if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter save schedule'})
 		{
 			&General::system('/usr/local/bin/urlfilterctrl', 'cron', 'monthly');
 		}
+		
+		if ($filtersettings{'ENABLE_AUTOUPDATE'} eq 'off')
+		{
+			&General::system('/usr/local/bin/urlfilterctrl', 'cron', 'remove');
+		}
 	}
 }
 
-- 
2.42.0