Add the ability to reorder target categories in squidGuard, to better facilitate making exceptions to lists.

5 files changed, 78 insertions, 4 deletions

diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc
index fb7fad28..1996600d 100644
--- a/config/squidGuard/squidguard.inc
+++ b/config/squidGuard/squidguard.inc
@@ -373,6 +373,44 @@ function squidguard_resync_acl() {
     }
 }
 
+# -----------------------------------------------------------------------------
+# squidguard_resync_dest
+# -----------------------------------------------------------------------------
+
+function squidguard_resync_dest() {
+	global $config; # !!! ORDER !!!
+
+	$conf = $config['installedpackages'][MODULE_DESTINATION]['config'];
+	$id = isset($_POST['id']) ? $_POST['id'] : $_GET['id'];
+
+	# --- sources part ---
+	# move current id by order
+	if (($id !== '') and is_array($conf)) {
+		$src_new = array();
+
+		foreach ($conf as $key => $src) {
+			$order = $src[F_ORDER];
+			# n_key: no_move=$key+$order or move=$order+$key
+			$n_key = is_numeric($order) ? sprintf("%04d%04d", $order, $key) : sprintf("%04d%04d", $key, 9999);
+			unset($src[F_ORDER]); # ! must be unset for display correct default position in 'select'!
+			$src_new[$n_key] = $src;
+		}
+		# sort by key
+		ksort($src_new);
+		reset($src_new);
+
+		$src_new = array_values($src_new); # make keys '0, 1, 2, ...'
+
+		# renew config
+		unset ($config['installedpackages'][MODULE_DESTINATION]['config']);
+		$config['installedpackages'][MODULE_DESTINATION]['config'] = $src_new;
+		write_config('Update squidguarddest config');
+
+		# renew global $squidguard_config
+		sg_init(convert_pfxml_to_sgxml());
+	}
+}
+
 # =============================================================================
 # common functions
 # =============================================================================
@@ -596,6 +634,27 @@ function squidguard_before_form_acl($pkg, $is_acl=true) {
 }
 
 # -----------------------------------------------------------------------------
+# squidguard_before_form_dest
+# -----------------------------------------------------------------------------
+function squidguard_before_form_dest($pkg) {
+	global $g, $squidguard_config;
+	$destination_items = get_sgconf_items_list(F_DESTINATIONS, 'name');
+//var_dump($squidguard_config);
+	$i=0;
+	foreach($pkg['fields']['field'] as $field) {
+		# order
+		if (is_array($destination_items) && $field['fieldname'] == 'order') {
+			$fld = &$pkg['fields']['field'][$i];
+			foreach($destination_items as $nmkey => $nm)
+				$fld['options']['option'][] = array('name'=>$nm, 'value'=>$nmkey);
+			$fld['options']['option'][] = array('name'=>'--- Last ---', 'value'=>'9999');
+			$fld['options']['option'][] = array('name'=>'-----', 'value'=>''); # ! this is must be last !
+		}
+		$i++;
+	}
+}
+
+# -----------------------------------------------------------------------------
 # make_grid_general_items
 # -----------------------------------------------------------------------------
 function make_grid_general_items($id = '')
@@ -1551,6 +1610,7 @@ function squidguard_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn
 function squidguard_all_after_XMLRPC_resync() {
 	
 	squidguard_resync_acl();
+	squidguard_resync_dest();
 	squidguard_resync();
 	
 	log_error("SquidGuard: Finished XMLRPC process. It should be OK. For more information look at the host which started sync.");
diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml
index c9df88ca..21356e1c 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.3_1 pkg v.1.9</version>
+	<version>1.4_4 pkg v.1.9.3</version>
 	<title>Proxy filter SquidGuard: General settings</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 	<!-- Installation -->
diff --git a/config/squidGuard/squidguard_dest.xml b/config/squidGuard/squidguard_dest.xml
index 5ffc0aa6..3525098e 100644
--- a/config/squidGuard/squidguard_dest.xml
+++ b/config/squidGuard/squidguard_dest.xml
@@ -77,6 +77,14 @@
 						<required/>
 				</field>
 				<field>
+						<fielddescr>Order</fielddescr>
+						<fieldname>order</fieldname>
+						<description><![CDATA[
+								Select the new position for this target category. Target categories are listed in this order on ALCs and are matched from the top down in sequence.<br>
+						]]></description>
+						<type>select</type>
+				</field>
+				<field>
 						<fielddescr>Domain List</fielddescr>
 						<fieldname>domains</fieldname>
 						<description><![CDATA[
@@ -163,12 +171,18 @@
 						<description><![CDATA[Check this option to enable logging for this ACL.]]></description>
 				</field>
 				</fields>
-	<custom_delete_php_command/>
+	<custom_php_command_before_form>
+				squidguard_before_form_dest(&amp;$pkg);
+	</custom_php_command_before_form>
 	<custom_php_validation_command>
 				squidguard_validate_destination($_POST, &amp;$input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
+				squidguard_resync_dest();
 	</custom_php_resync_config_command>
+	<custom_delete_php_command>
+				squidguard_resync_dest();
+	</custom_delete_php_command>
 	<custom_php_after_form_command>
 				squidGuard_print_javascript();
 	</custom_php_after_form_command>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index f1f66b23..e12b3a33 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1325,7 +1325,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<category>Network Management</category>
-		<version>1.4_4 pkg v.1.9.2</version>
+		<version>1.4_4 pkg v.1.9.3</version>
 		<status>Beta</status>
 		<required_version>1.1</required_version>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b44078f3..1bcdbe91 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1312,7 +1312,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<category>Network Management</category>
-		<version>1.4_4 pkg v.1.9.2</version>
+		<version>1.4_4 pkg v.1.9.3</version>
 		<status>Beta</status>
 		<required_version>1.1</required_version>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>