From f91970e1c1fa76630fb1fdd51a9aca54bd5f05d1 Mon Sep 17 00:00:00 2001
From: Nicolas Liaudat <nliaudat@users.noreply.github.com>
Date: Wed, 25 Feb 2015 16:41:49 +0100
Subject: Update squidguard_configurator.inc

Fix commit eb7182a & it's revert to finaly works for everybody :)
---
 config/squidGuard/squidguard_configurator.inc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'config/squidGuard')

diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index d3448c5d..6b2b944c 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -91,11 +91,20 @@ define('CONFIG_SG_HEADER', "
 # ------------------------------------------------------------------------------
 # squid config options
 # ------------------------------------------------------------------------------
+
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+
 define('REDIRECTOR_OPTIONS_REM',   '# squidGuard options');
-define('REDIRECTOR_PROGRAM_OPT',   'redirect_program');
-define('REDIRECT_BYPASS_OPT',      'redirector_bypass');
 define('REDIRECT_CHILDREN_OPT',    'url_rewrite_children');
-define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started
+if ($pf_version >= 2.2) { 
+   define('REDIRECTOR_PROGRAM_OPT',   'url_rewrite_program');
+   define('REDIRECT_BYPASS_OPT',      'url_rewrite_bypass');
+   define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0');# redirector processes count will started
+} else {
+   define('REDIRECTOR_PROGRAM_OPT',   'redirect_program');
+   define('REDIRECT_BYPASS_OPT',      'redirector_bypass');
+   define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started
+}
 
 # ------------------------------------------------------------------------------
 # squidguard config options
@@ -111,7 +120,7 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u');
 # squidguard system constants
 # ------------------------------------------------------------------------------
 
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+
 if ($pf_version > 2.0) {
 	if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m")))
 		define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m"));
-- 
cgit v1.2.3


From b5b0534ee97915921c1efaf66288c481fd2a96e1 Mon Sep 17 00:00:00 2001
From: Nicolas Liaudat <nliaudat@users.noreply.github.com>
Date: Wed, 4 Mar 2015 09:03:32 +0100
Subject: Update squidguard_configurator.inc

---
 config/squidGuard/squidguard_configurator.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/squidGuard')

diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index 6b2b944c..38104c89 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -99,11 +99,11 @@ define('REDIRECT_CHILDREN_OPT',    'url_rewrite_children');
 if ($pf_version >= 2.2) { 
    define('REDIRECTOR_PROGRAM_OPT',   'url_rewrite_program');
    define('REDIRECT_BYPASS_OPT',      'url_rewrite_bypass');
-   define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0');# redirector processes count will started
+   define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0');
 } else {
    define('REDIRECTOR_PROGRAM_OPT',   'redirect_program');
    define('REDIRECT_BYPASS_OPT',      'redirector_bypass');
-   define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started
+   define('REDIRECTOR_PROCESS_COUNT', '5');
 }
 
 # ------------------------------------------------------------------------------
-- 
cgit v1.2.3


From ac33f9c22ef8d4da28e00e306d985dc5420cbb9c Mon Sep 17 00:00:00 2001
From: Nicolas Liaudat <nliaudat@users.noreply.github.com>
Date: Tue, 31 Mar 2015 13:19:20 +0200
Subject: Update squidguard.xml

---
 config/squidGuard/squidguard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/squidGuard')

diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml
index 3a77edf3..7f3036ba 100644
--- a/config/squidGuard/squidguard.xml
+++ b/config/squidGuard/squidguard.xml
@@ -6,7 +6,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>squidguardgeneral</name>
-	<version>1.4_4 pkg v.1.9.8</version>
+	<version>1.4_7 pkg v.1.9.11</version>
 	<title>Proxy filter SquidGuard: General settings</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 	<!-- Installation -->
-- 
cgit v1.2.3