From 7bfdf0ccb852b349b006be709ee991ae8ecbb4e7 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:33:53 +0100 Subject: Update config/squidGuard/squidguard.inc --- config/squidGuard/squidguard.inc | 159 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 1 deletion(-) diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index 7b10536d..fb7fad28 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -332,6 +332,7 @@ function squidguard_resync() { //} squidguard_cron_install(); + squidguard_sync_on_changes(); } # ----------------------------------------------------------------------------- @@ -1399,4 +1400,160 @@ function squidguard_blacklist_list() return $res; } -?> \ No newline at end of file + +// ##### The following part is based on the code of pfblocker ##### + +/* Uses XMLRPC to synchronize the changes to a remote node */ +function squidguard_sync_on_changes() { + global $config, $g; + $varsyncenablexmlrpc = $config['installedpackages']['squidguardsync']['config'][0]['varsyncenablexmlrpc']; + $varsynctimeout = $config['installedpackages']['squidguardsync']['config'][0]['varsynctimeout']; + + // if checkbox is NOT checked do nothing + if(!$varsyncenablexmlrpc) { + return; + } + + log_error("SquidGuard: Starting XMLRPC process (squidguard_do_xmlrpc_sync) with timeout {$varsynctimeout} seconds."); + + // if checkbox is checked get IP and password of the destination hosts + foreach ($config['installedpackages']['squidguardsync']['config'] as $rs ){ + foreach($rs['row'] as $sh){ + // if checkbox is NOT checked do nothing + if($sh['varsyncdestinenable']) { + $varsyncprotocol = $sh['varsyncprotocol']; + $sync_to_ip = $sh['varsyncipaddress']; + $password = $sh['varsyncpassword']; + $varsyncport = $sh['varsyncport']; + // check if all credentials are complete for this host + if($password && $sync_to_ip && $varsyncport && $varsyncprotocol) { + squidguard_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyncprotocol); + } + else { + log_error("SquidGuard: XMLRPC Sync with {$sh['varsyncipaddress']} has incomplete credentials. No XMLRPC Sync done!"); + } + } + else { + log_error("SquidGuard: XMLRPC Sync with {$sh['varsyncipaddress']} is disabled"); + } + } + } + log_error("SquidGuard: Finished XMLRPC process (squidguard_do_xmlrpc_sync)."); +} + +/* Do the actual XMLRPC sync */ +function squidguard_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyncprotocol) { + global $config, $g; + + $varsynctimeout = $config['installedpackages']['squidguardsync']['config'][0]['varsynctimeout']; + + if($varsynctimeout == '' || $varsynctimeout == 0) { + $varsynctimeout = 150; + } + + // log_error("SquidGuard: Starting XMLRPC process (squidguard_do_xmlrpc_sync) with timeout {$varsynctimeout} seconds."); + + if(!$password) + return; + + if(!$sync_to_ip) + return; + + if(!$varsyncport) + return; + + if(!$varsyncprotocol) + return; + + // Check and choose correct protocol type, port number and IP address + $synchronizetoip .= "$varsyncprotocol" . '://'; + $port = "$varsyncport"; + + $synchronizetoip .= $sync_to_ip; + + /* xml will hold the sections to sync */ + $xml = array(); + $xml['squidguardgeneral'] = $config['installedpackages']['squidguardgeneral']; + $xml['squidguardacl'] = $config['installedpackages']['squidguardacl']; + $xml['squidguarddefault'] = $config['installedpackages']['squidguarddefault']; + $xml['squidguarddest'] = $config['installedpackages']['squidguarddest']; + $xml['squidguardrewrite'] = $config['installedpackages']['squidguardrewrite']; + $xml['squidguardtime'] = $config['installedpackages']['squidguardtime']; + + /* assemble xmlrpc payload */ + $params = array( + XML_RPC_encode($password), + XML_RPC_encode($xml) + ); + + /* set a few variables needed for sync code borrowed from filter.inc */ + $url = $synchronizetoip; + log_error("SquidGuard: Beginning squidguard XMLRPC sync with {$url}:{$port}."); + $method = 'pfsense.merge_installedpackages_section_xmlrpc'; + $msg = new XML_RPC_Message($method, $params); + $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); + $cli->setCredentials('admin', $password); + if($g['debug']) + $cli->setDebug(1); + /* send our XMLRPC message and timeout after $varsynctimeout seconds */ + $resp = $cli->send($msg, $varsynctimeout); + if(!$resp) { + $error = "A communications error occurred while squidguard was attempting XMLRPC sync with {$url}:{$port}."; + log_error("SquidGuard: $error"); + file_notice("sync_settings", $error, "squidguard Settings Sync", ""); + } elseif($resp->faultCode()) { + $cli->setDebug(1); + $resp = $cli->send($msg, $varsynctimeout); + $error = "An error code was received while squidguard XMLRPC was attempting to sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error("SquidGuard: $error"); + file_notice("sync_settings", $error, "squidguard Settings Sync", ""); + } else { + log_error("SquidGuard: XMLRPC has synced data successfully with {$url}:{$port}."); + } + + /* tell squidguard to reload our settings on the destionation sync host. */ + $method = 'pfsense.exec_php'; + $execcmd = "require_once('/usr/local/pkg/squidguard.inc');\n"; + // pfblocker just needed one fuction to reload after XMLRPC. squidguard needs more so we point to a fuction below which contains all fuctions + $execcmd .= "squidguard_all_after_XMLRPC_resync();"; + + /* assemble xmlrpc payload */ + $params = array( + XML_RPC_encode($password), + XML_RPC_encode($execcmd) + ); + + log_error("SquidGuard XMLRPC is reloading data on {$url}:{$port}."); + $msg = new XML_RPC_Message($method, $params); + $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); + $cli->setCredentials('admin', $password); + $resp = $cli->send($msg, $varsynctimeout); + if(!$resp) { + $error = "A communications error occurred while squidguard was attempting XMLRPC sync with {$url}:{$port} (exec_php)."; + log_error($error); + file_notice("sync_settings", $error, "squidguard Settings Sync", ""); + } elseif($resp->faultCode()) { + $cli->setDebug(1); + $resp = $cli->send($msg, $varsynctimeout); + $error = "An error code was received while squidguard XMLRPC was attempting to sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error($error); + file_notice("sync_settings", $error, "squidguard Settings Sync", ""); + } else { + log_error("SquidGuard: XMLRPC has reloaded data successfully on {$url}:{$port} (exec_php)."); + } + +} + +// ##### The part above is based on the code of pfblocker ##### + +// This function restarts all other needed functions after XMLRPC so that the content of .XML + .INC will be written in the files +// Adding more functions will increase the time to sync +function squidguard_all_after_XMLRPC_resync() { + + squidguard_resync_acl(); + squidguard_resync(); + + log_error("SquidGuard: Finished XMLRPC process. It should be OK. For more information look at the host which started sync."); +} + +?> -- cgit v1.2.3 From 294f8bb02b281fe16bb99445993401e7f6ab9e5e Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:34:15 +0100 Subject: Update config/squidGuard/squidguard.xml --- config/squidGuard/squidguard.xml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml index d84d53ab..36064fdb 100644 --- a/config/squidGuard/squidguard.xml +++ b/config/squidGuard/squidguard.xml @@ -2,7 +2,7 @@ - Describe your package here + [ Describe your package requirements here Currently there are no FAQ items provided. squidguardgeneral @@ -50,10 +50,14 @@ Log /squidGuard/squidguard_log.php + + XMLRPC Sync + /pkg_edit.php?xml=squidguard_sync.xml + squidGuard - Proxy server filter Service + squidGuard @@ -110,31 +114,39 @@ Enable squidguard_enable - Check this for enable squidGuard + checkbox + + + Logging options + listtopic Enable GUI log enable_guilog - Check this for enable GUI log. + checkbox Enable log enable_log - Check this for enable log of the proxy filter. Usually log used for testing filter settings. + checkbox Enable log rotation log_rotation - Check this for enable daily rotate a log of the proxy filter. Use this option for limit log file size. + checkbox + + + Miscellaneous + listtopic Clean Advertising adv_blankimg - Check this to display a blank gif image instead the default block page. With this option you get a cleaner page. + checkbox @@ -144,24 +156,24 @@ Blacklist blacklist - Check this for enable blacklist + checkbox Blacklist proxy blacklist_proxy - - Blacklist upload proxy - enter here, or leave blank. - Format: host:[port login:pass] . Default proxy port 1080. + + Blacklist upload proxy - enter here, or leave blank.
+ Format: host:[port login:pass] . Default proxy port 1080.
Example: '192.168.0.1:8080 user:pass' - + ]]> input 100 Blacklist URL blacklist_url - Enter FTP, HTTP or LOCAL (firewall) URL blacklist archive, or leave blank. + input 100 -- cgit v1.2.3 From 1b66bc16f122925843b088b41a1f2b978669a4fc Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:34:34 +0100 Subject: Update config/squidGuard/squidguard_acl.xml --- config/squidGuard/squidguard_acl.xml | 353 +++++++++++++++++------------------ 1 file changed, 175 insertions(+), 178 deletions(-) diff --git a/config/squidGuard/squidguard_acl.xml b/config/squidGuard/squidguard_acl.xml index 1b631ca3..07ecd71b 100644 --- a/config/squidGuard/squidguard_acl.xml +++ b/config/squidGuard/squidguard_acl.xml @@ -2,7 +2,7 @@ - Describe your package here + Describe your package requirements here Currently there are no FAQ items provided. squidguardacl @@ -45,201 +45,198 @@ Log /squidGuard/squidguard_log.php + + XMLRPC Sync + /pkg_edit.php?xml=squidguard_sync.xml + - - Disabled - disabled - - - Name - name - - - Time - time - - - Description - description - + + Disabled + disabled + + + Name + name + + + Time + time + + + Description + description + - - Disabled - disabled - Check this for disable this ACL rule. - checkbox - - - Name - name - - Enter the unique name here. - Name must consist of minimum 2 symbols, first from which letter. <br> - All other symbols must be [a-Z_0-9]. - - input - - 100 - - - Order - order - - Select the new position for ACL item. ACL are evaluated on a first-match source basis.<br> - <b>Note:</b> <br> - Search for a suitable ACL by field 'source' will occur before the first match. If you want to define an exception for some sources (IP) from the IP range, put them on first of the list. <br> - <b>For example:</b> <br> - ACL with single (or short range) source ip 10.0.0.15, must be placed before ACL with more large ip range 10.0.0.0/24 <br> - - select - - - Client (source) - source - - Enter client's IP address or domain or "username" here. For separate use space. - <br><b>Example:</b> - <br>ip: 192.168.0.1 or subnet 192.168.0.0/24 or subnet 192.168.1.0/255.255.255.0 or range 192.168.1.1-192.168.1.10 - <br>domain: foo.bar match foo.bar or *.foo.bar - <br>username: 'user1' - - textarea - 65 - 3 - - - - Time - time - Select time in which 'Target Rules' will operate, or leave 'none' for action of rules without time restriction. If this option is set, then in off-time will operate the second rule set. - select - - - Target Rules - dest - - input - 100 - - - Not to allow IP addresses in URL - notallowingip - - To make sure that people don't bypass the URL filter. - by simply using the IP addresses instead of the fully qualified domain names, you can check this option. - This option has no effect on the WhiteList. - - checkbox - - - Redirect mode - redirect_mode - - Select redirect mode here. - <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. - - <br> Options: - <A title="To 'url' will added special client information;" > - <span style="background-color: #dddddd;" >ext url err page</span></A> , - <A title="Client view 'url' content without any notification about;" > - <span style="background-color: #dddddd;" > ext url redirect</span></A> , - <A title="Client will moved to specified url with displaying url in addres bar;" > - <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , - <A title="Client will moved to specified url with showing progress(only!) in status bar;" > - <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> - </u> - - select - rmod_none - - - - - - - - - - - - - - Redirect - redirect - - Enter external redirection URL, error message or size (bytes) here. - - textarea - 65 - 2 - + + Disabled + disabled + + checkbox + + + Name + name + + The name must consist between 2 and 15 symbols [a-Z_0-9]. The first one must be a letter.
+ ]]> + input + + 100 + + + Order + order + + Note:
+ Search for a suitable ACL by field 'source' will occur before the first match. If you want to define an exception for some sources (IP) from the IP range, put them on first of the list.
+ Example:
+ ACL with single (or short range) source ip 10.0.0.15 must be placed before ACL with more large ip range 10.0.0.0/24.
+ ]]> + select + + + Client (source) + source + + Example:
+ IP: 192.168.0.1 - Subnet: 192.168.0.0/24 or 192.168.1.0/255.255.255.0 - IP-Range: 192.168.1.1-192.168.1.10
+ Domain: foo.bar matches foo.bar or *.foo.bar
+ Username: 'user1' + ]]> + textarea + 65 + 3 + + + + Time + time + + select + + + Target Rules + dest + + input + 100 + + + Do not allow IP-Addresses in URL + notallowingip + + checkbox + + + Redirect mode + redirect_mode + + Select redirect mode here. + <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. + + <br> Options: + <A title="To 'url' will added special client information;" > + <span style="background-color: #dddddd;" >ext url err page</span></A> , + <A title="Client view 'url' content without any notification about;" > + <span style="background-color: #dddddd;" > ext url redirect</span></A> , + <A title="Client will moved to specified url with displaying url in addres bar;" > + <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , + <A title="Client will moved to specified url with showing progress(only!) in status bar;" > + <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> + </u> + + select + rmod_none + + + + + + + + + + + + + + Redirect + redirect + + textarea + 65 + 2 + - - Use SafeSearch engine - safesearch - - To protect your children from adult content, you can use the protected mode of search engines. - Now it is supported by Google, Yandex, Yahoo, MSN, Live Search, Bing. Make sure that the search engines can, and others, it is recommended to prohibit. - <br>Note: ! This option overrides 'Rewrite' setting. ! - - checkbox - - - Rewrite - rewrite - Enter rewrite condition name for this rule, or leave blank. - select - - - Rewrite for off-time - overrewrite - Enter rewrite condition name for this rule, or leave blank. - select - - - Description - description - You may enter a description here for your reference (not parsed). - input - 100 - - - Log - enablelog - Check this for log this item. - checkbox - + + Use SafeSearch engine + safesearch + + At the moment it is supported by Google, Yandex, Yahoo, MSN, Live Search and Bing. Make sure that the search engines can be accessed. It is recommended to prohibit access to others.
+ Note: This option overrides 'Rewrite' setting. + ]]> + checkbox + + + Rewrite + rewrite + + select + + + Rewrite for off-time + overrewrite + + select + + + Description + description + + input + 100 + + + Log + enablelog + + checkbox + - squidguard_validate_acl(&$_POST, &$input_errors); + squidguard_validate_acl(&$_POST, &$input_errors); - squidguard_before_form_acl(&$pkg); + squidguard_before_form_acl(&$pkg); - squidGuard_print_javascript(); + squidGuard_print_javascript(); - squidguard_resync_acl(); + squidguard_resync_acl(); - squidguard_resync_acl(); + squidguard_resync_acl(); - \ No newline at end of file + -- cgit v1.2.3 From 3c48591e3f654437fc3dccb71104f4901f6b65db Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:34:53 +0100 Subject: Update config/squidGuard/squidguard_blacklist.php --- config/squidGuard/squidguard_blacklist.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/squidGuard/squidguard_blacklist.php b/config/squidGuard/squidguard_blacklist.php index 5e8382ae..98e0aecd 100644 --- a/config/squidGuard/squidguard_blacklist.php +++ b/config/squidGuard/squidguard_blacklist.php @@ -236,6 +236,7 @@ window.setTimeout('getactivity()', 150); $tab_array[] = array(gettext("Rewrites"), false, "/pkg.php?xml=squidguard_rewr.xml"); $tab_array[] = array(gettext("Blacklist"), true, "/squidGuard/squidguard_blacklist.php"); $tab_array[] = array(gettext("Log"), false, "/squidGuard/squidguard_log.php"); + $tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=squidguard_sync.xml&id=0"); display_top_tabs($tab_array); ?> -- cgit v1.2.3 From d222719fd3b25fda1a469b44544317d4ac48f5dd Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:35:11 +0100 Subject: Update config/squidGuard/squidguard_configurator.inc --- config/squidGuard/squidguard_configurator.inc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index 5cef11cb..0100fba4 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -1883,17 +1883,18 @@ function acl_remove_blacklist_items($items) # ----------------------------------------------------------------------------- function sg_script_logrotate() { - $lines = 1000; # SG logfile truncate lines count - global $squidguard_config; - $sglogname = $squidguard_config[F_LOGDIR] . "/" . SQUIDGUARD_LOGFILE; + global $squidguard_config; + + $sglogname = $squidguard_config[F_LOGDIR] . "/" . SQUIDGUARD_LOGFILE; $sgguilogname = $squidguard_config[F_LOGDIR] . "/" . SQUIDGUARD_GUILOGFILE; + $sgconflogname = $squidguard_config[F_LOGDIR] . "/" . SQUIDGUARD_CONFLOGFILE; $res = << {$sglogname}.0 tail -{$lines} {$sglogname}.0 > {$sglogname} rm -f {$sglogname}.0 @@ -1901,6 +1902,10 @@ rm -f {$sglogname}.0 tail -{$lines} {$sgguilogname} > {$sgguilogname}.0 tail -{$lines} {$sgguilogname}.0 > {$sgguilogname} rm -f {$sgguilogname}.0 +# Rotates the squidguard conf logile +tail -{$lines} {$sgconflogname} > {$sgconflogname}.0 +tail -{$lines} {$sgconflogname}.0 > {$sgconflogname} +rm -f {$sgconflogname}.0 EOD; return $res; } -- cgit v1.2.3 From e8625f185d520c066604af6e109582d31c0e1bda Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:35:25 +0100 Subject: Update config/squidGuard/squidguard_default.xml --- config/squidGuard/squidguard_default.xml | 189 +++++++++++++++---------------- 1 file changed, 93 insertions(+), 96 deletions(-) diff --git a/config/squidGuard/squidguard_default.xml b/config/squidGuard/squidguard_default.xml index ff05085a..01380ea5 100644 --- a/config/squidGuard/squidguard_default.xml +++ b/config/squidGuard/squidguard_default.xml @@ -2,7 +2,7 @@ - Describe your package here + Describe your package requirements here Currently there are no FAQ items provided. squidguarddefault @@ -43,110 +43,107 @@ Log /squidGuard/squidguard_log.php + + XMLRPC Sync + /pkg_edit.php?xml=squidguard_sync.xml + - - Target Rules - dest - - input - 100 - - - Not to allow IP addresses in URL - notallowingip - - To make sure that people don't bypass the URL filter - by simply using the IP addresses instead of the fully qualified domain names, you can check this option. - This option has no effect on the WhiteList. - - checkbox - - - Proxy Denied Error - deniedmessage - The first part of the error message displayed to clients when denied. Defaults to "Request denied by $g['product_name'] proxy" - textarea - 65 - 2 - - - - Redirect mode - redirect_mode - - Select redirect mode here. - <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. - - <br> Options: - <A title="To 'url' will added special client information;" > - <span style="background-color: #dddddd;" >ext url err page</span></A> , - <A title="Client view 'url' content without any notification about;" > - <span style="background-color: #dddddd;" > ext url redirect</span></A> , - <A title="Client will moved to specified url with displaying url in addres bar;" > - <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , - <A title="Client will moved to specified url with showing progress(only!) in status bar;" > - <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> - </u> - - select - rmod_none - - - - - - - - - - - - - - Redirect info - redirect - - Enter external redirection URL, error message or size (bytes) here. - - textarea - 65 - 2 - - - Use SafeSearch engine - safesearch - - To protect your children from adult content, you can use the protected mode of search engines. - Now it is supported by Google, Yandex, Yahoo, MSN, Live Search, Bing. Make sure that the search engines can, and others, it is recommended to prohibit. - <br>Note: ! This option overrides 'Rewrite' setting. ! - - checkbox - - - Rewrite - rewrite - Enter rewrite condition name for this rule, or leave blank. - select - - - Log - enablelog - Check this for log this item. - checkbox - + + Target Rules + dest + + input + 100 + + + Do not allow IP-Addresses in URL + notallowingip + + checkbox + + + Proxy Denied Error + deniedmessage + "Request denied by $g['product_name'] proxy"]]> + textarea + 65 + 2 + + + Redirect mode + redirect_mode + + Select redirect mode here. + <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. + + <br> Options: + <A title="To 'url' will added special client information;" > + <span style="background-color: #dddddd;" >ext url err page</span></A> , + <A title="Client view 'url' content without any notification about;" > + <span style="background-color: #dddddd;" > ext url redirect</span></A> , + <A title="Client will moved to specified url with displaying url in addres bar;" > + <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , + <A title="Client will moved to specified url with showing progress(only!) in status bar;" > + <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> + </u> + + select + rmod_none + + + + + + + + + + + + + + Redirect info + redirect + + textarea + 65 + 2 + + + Use SafeSearch engine + safesearch + + At the moment it is supported by Google, Yandex, Yahoo, MSN, Live Search and Bing. Make sure that the search engines can be accessed. It is recommended to prohibit access to others.
+ Note: This option overrides 'Rewrite' setting. + ]]> + checkbox + + + Rewrite + rewrite + + select + + + Log + enablelog + + checkbox + - squidguard_validate_acl(&$_POST, &$input_errors); + squidguard_validate_acl(&$_POST, &$input_errors); - squidguard_before_form_acl(&$pkg, false); + squidguard_before_form_acl(&$pkg, false); - squidGuard_print_javascript(); + squidGuard_print_javascript(); -// squidguard_resync(); +// squidguard_resync(); - \ No newline at end of file + -- cgit v1.2.3 From ad0c0d63c77a214049d4d8632c30b7bf51d71791 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:35:41 +0100 Subject: Update config/squidGuard/squidguard_dest.xml --- config/squidGuard/squidguard_dest.xml | 236 +++++++++++++++++----------------- 1 file changed, 117 insertions(+), 119 deletions(-) diff --git a/config/squidGuard/squidguard_dest.xml b/config/squidGuard/squidguard_dest.xml index 9c425816..9f785d95 100644 --- a/config/squidGuard/squidguard_dest.xml +++ b/config/squidGuard/squidguard_dest.xml @@ -2,7 +2,7 @@ - Describe your package here + Describe your package requirements here Currently there are no FAQ items provided. squidguarddest @@ -45,132 +45,130 @@ Log /squidGuard/squidguard_log.php + + XMLRPC Sync + /pkg_edit.php?xml=squidguard_sync.xml + - - Name - name - - - Redirect - redirect - - - Description - description - + + Name + name + + + Redirect + redirect + + + Description + description + - - Name - name - - Enter the unique name here. - Name must consist of minimum 2 symbols, first from which letter. <br> - All other symbols must be [a-Z_0-9]. - - input - 100 - - - - Domains list - domains - - Enter destination domains or IP-address here. For separate use ' '(space). - <p> <b>Example:</b> 'mail.ru e-mail.ru yahoo.com 192.168.1.1' . - - textarea - 60 - 10 - - - URLs list - urls - - Enter url's here. - For separate urls's use ' '(space). - <p> <b>Example:</b> 'host.com/xxx 12.10.220.125/alisa' . - - textarea - 60 - 10 - - - Expressions - expressions - - Enter word fragments, what may be contains in destinations URL path. - For separate expression words use '|'. - <p> <b>Example:</b> 'mail|casino|game' . - - textarea - 60 - 10 - - - Redirect mode - redirect_mode - - Select redirect mode here. - <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. - - <br> Options: - <A title="To 'url' will added special client information;" > - <span style="background-color: #dddddd;" >ext url err page</span></A> , - <A title="Client view 'url' content without any notification about;" > - <span style="background-color: #dddddd;" > ext url redirect</span></A> , - <A title="Client will moved to specified url with displaying url in addres bar;" > - <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , - <A title="Client will moved to specified url with showing progress(only!) in status bar;" > - <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> - </u> - - select - rmod_none - - - - - - - - - - - - - - Redirect - redirect - - Enter external redirection URL, error message or size (bytes) here. - - textarea - 60 - 2 - - - Log - enablelog - checkbox - Check this for log this item. - - - Description - description - You may enter a description here for your reference (not parsed). - input - 90 - - + + Name + name + + The name must consist between 2 and 15 symbols [a-Z_0-9]. The first one must be a letter.
+ ]]> + input + 100 + + + + Domain List + domains + + Example: mail.ru e-mail.ru yahoo.com 192.168.1.1 + ]]> + textarea + 60 + 10 + + + URL List + urls + + Example: host.com/xxx 12.10.220.125/alisa + ]]> + textarea + 60 + 10 + + + Regular Expression + expressions + | . + Example: mail|casino|game|\.rsdf$ + ]]> + textarea + 60 + 10 + + + Redirect mode + redirect_mode + + Select redirect mode here. + <br> Note: if you use 'transparent proxy', then 'int' redirect mode will not accessible. + + <br> Options: + <A title="To 'url' will added special client information;" > + <span style="background-color: #dddddd;" >ext url err page</span></A> , + <A title="Client view 'url' content without any notification about;" > + <span style="background-color: #dddddd;" > ext url redirect</span></A> , + <A title="Client will moved to specified url with displaying url in addres bar;" > + <span style="background-color: #dddddd;" > ext url as 'move'</span></A> , + <A title="Client will moved to specified url with showing progress(only!) in status bar;" > + <span style="background-color: #dddddd;" > ext url as 'found'.</span></A> + </u> + + select + rmod_none + + + + + + + + + + + + + + Redirect + + textarea + 60 + 2 + + + Description + description + + input + 90 + + + Log + enablelog + checkbox + + + - squidguard_validate_destination($_POST, &$input_errors); + squidguard_validate_destination($_POST, &$input_errors); - squidGuard_print_javascript(); + squidGuard_print_javascript(); - \ No newline at end of file + -- cgit v1.2.3 From 5f7d24be7fbb3694b1c1e61db48c9ad13d39e0d8 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:36:00 +0100 Subject: Update config/squidGuard/squidguard_log.php --- config/squidGuard/squidguard_log.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/squidGuard/squidguard_log.php b/config/squidGuard/squidguard_log.php index e5f19407..8eba2311 100644 --- a/config/squidGuard/squidguard_log.php +++ b/config/squidGuard/squidguard_log.php @@ -275,6 +275,7 @@ window.setTimeout('getactivity()', 150); $tab_array[] = array(gettext("Rewrites"), false, "/pkg.php?xml=squidguard_rewr.xml"); $tab_array[] = array(gettext("Blacklist"), false, "/squidGuard/squidguard_blacklist.php"); $tab_array[] = array(gettext("Log"), true, "$selfpath"); + $tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=squidguard_sync.xml&id=0"); display_top_tabs($tab_array); ?> @@ -323,4 +324,4 @@ window.setTimeout('getactivity()', 150); Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); - \ No newline at end of file + -- cgit v1.2.3 From 999e5a18e560fb5d73e8b6140ec2a157e6ab14f5 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Wed, 9 Jan 2013 21:36:17 +0100 Subject: Update config/squidGuard/squidguard_rewr.xml --- config/squidGuard/squidguard_rewr.xml | 45 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/config/squidGuard/squidguard_rewr.xml b/config/squidGuard/squidguard_rewr.xml index 8a3f801f..c21cb1c0 100644 --- a/config/squidGuard/squidguard_rewr.xml +++ b/config/squidGuard/squidguard_rewr.xml @@ -2,7 +2,7 @@ - Describe your package here + Describe your package requirements here Currently there are no FAQ items provided. squidguardrewrite @@ -43,6 +43,10 @@ Log /squidGuard/squidguard_log.php + + XMLRPC Sync + /pkg_edit.php?xml=squidguard_sync.xml + @@ -58,11 +62,10 @@ Name name - - Enter the unique name here. - Name must consist of minimum 2 symbols, first from which letter. <br> - All other symbols must be [a-Z_0-9]. - + + The name must consist between 2 and 15 symbols [a-Z_0-9]. The first one must be a letter.
+ ]]> input 100 @@ -89,13 +92,13 @@ Opt. mode select - no - - - - - - + no + + + + + +