aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/squid-reverse/squid.inc59
-rw-r--r--config/squid-reverse/squid_ng.inc6
-rw-r--r--config/squid-reverse/squid_ng.xml4
3 files changed, 52 insertions, 17 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index cec4ff32..355a61f0 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -316,7 +316,10 @@ function squid_deinstall_command() {
global $config, $g;
$plswait_txt = "This operation may take quite some time, please be patient. Do not press stop or attempt to navigate away from this page during this process.";
squid_install_cron(false);
- $settings = &$config['installedpackages']['squidcache']['config'][0];
+ if (is_array($config['installedpackages']['squidcache']))
+ $settings = $config['installedpackages']['squidcache']['config'][0];
+ else
+ $settings = array();
$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
update_status("Removing swap.state ... One moment please...");
@@ -359,7 +362,10 @@ function squid_before_form_general($pkg) {
function squid_validate_general($post, $input_errors) {
global $config;
- $settings = $config['installedpackages']['squid']['config'][0];
+ if (is_array($config['installedpackages']['squid']))
+ $settings = $config['installedpackages']['squid']['config'][0];
+ else
+ $settings = array();
$port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
$port = $post['proxy_port'] ? $post['proxy_port'] : $port;
@@ -662,7 +668,12 @@ function squid_install_cron($should_install) {
if(!$config['cron']['item'])
return;
- $settings = $config['installedpackages']['squidcache']['config'][0];
+
+ if (is_array($config['installedpackages']['squidcache']))
+ $settings = $config['installedpackages']['squidcache']['config'][0];
+ else
+ $settings = array();
+
$x=0;
$rotate_job_id=-1;
$swapstate_job_id=-1;
@@ -732,7 +743,10 @@ function squid_install_cron($should_install) {
function squid_resync_general() {
global $g, $config, $valid_acls;
- $settings = $config['installedpackages']['squid']['config'][0];
+ if (is_array($config['installedpackages']['squid']))
+ $settings = $config['installedpackages']['squid']['config'][0];
+ else
+ $settings=array();
$conf = "# This file is automatically generated by pfSense\n";
$conf .= "# Do not edit manually !\n";
@@ -997,8 +1011,11 @@ function squid_resync_redirector() {
function squid_resync_nac() {
global $config, $valid_acls;
- $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
- $settings = $config['installedpackages']['squidnac']['config'][0];
+ $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
+ if (is_array($config['installedpackages']['squidnac']))
+ $settings = $config['installedpackages']['squidnac']['config'][0];
+ else
+ $settings = array();
$webgui_port = $config['system']['webgui']['port'];
$addtl_ports = $settings['addtl_ports'];
$addtl_sslports = $settings['addtl_sslports'];
@@ -1082,14 +1099,21 @@ EOD;
function squid_resync_traffic() {
global $config, $valid_acls;
+
if(!is_array($valid_acls))
return;
- $settings = $config['installedpackages']['squidtraffic']['config'][0];
+ if (is_array($config['installedpackages']['squidtraffic']))
+ $settings = $config['installedpackages']['squidtraffic']['config'][0];
+ else
+ $settings = array();
+
$conf = '';
-
- if (!empty($settings['quick_abort_min']) || ($settings['quick_abort_min']) == "0") $conf .= "quick_abort_min {$settings['quick_abort_min']} KB\n";
- if (!empty($settings['quick_abort_max']) || ($settings['quick_abort_max']) == "0") $conf .= "quick_abort_max {$settings['quick_abort_max']} KB\n";
- if (!empty($settings['quick_abort_pct'])) $conf .= "quick_abort_pct {$settings['quick_abort_pct']}\n";
+ if (!empty($settings['quick_abort_min']) || ($settings['quick_abort_min']) == "0")
+ $conf .= "quick_abort_min {$settings['quick_abort_min']} KB\n";
+ if (!empty($settings['quick_abort_max']) || ($settings['quick_abort_max']) == "0")
+ $conf .= "quick_abort_max {$settings['quick_abort_max']} KB\n";
+ if (!empty($settings['quick_abort_pct']))
+ $conf .= "quick_abort_pct {$settings['quick_abort_pct']}\n";
$up_limit = ($settings['max_upload_size'] ? $settings['max_upload_size'] : 0);
$down_limit = ($settings['max_download_size'] ? $settings['max_download_size'] : 0);
@@ -1177,10 +1201,18 @@ function squid_resync_auth() {
if (is_array($config['installedpackages']['squidauth']['config']))
$settings = $config['installedpackages']['squidauth']['config'][0];
+ else
+ $settings = array();
+
if (is_array($config['installedpackages']['squidnac']['config']))
$settingsnac = $config['installedpackages']['squidnac']['config'][0];
+ else
+ $settingsnac = array();
+
if (is_array($config['installedpackages']['squid']['config']))
$settingsconfig = $config['installedpackages']['squid']['config'][0];
+ else
+ $settingsconfig = array();
$conf = '';
@@ -1328,7 +1360,10 @@ function squid_resync_users() {
function squid_resync_msnt() {
global $config;
- $settings = $config['installedpackages']['squidauth']['config'][0];
+ if (is_array($config['installedpackages']['squidauth']))
+ $settings = $config['installedpackages']['squidauth']['config'][0];
+ else
+ $settings = array();
$pdcserver = $settings['auth_server'];
$bdcserver = str_replace(',',' ',$settings['msnt_secondary']);
$ntdomain = $settings['auth_ntdomain'];
diff --git a/config/squid-reverse/squid_ng.inc b/config/squid-reverse/squid_ng.inc
index 03f6d48c..b0604b02 100644
--- a/config/squid-reverse/squid_ng.inc
+++ b/config/squid-reverse/squid_ng.inc
@@ -796,11 +796,11 @@ function global_write_squid_config()
touch($squidconfig);
} /* end function write_squid_config */
-function custom_php_install_command() {
+function squid3_custom_php_install_command() {
/* write initial static config for transparent proxy */
write_static_squid_config();
- touch("/tmp/custom_php_install_command");
+ touch("/tmp/squid3_custom_php_install_command");
/* make sure this all exists, see:
* http://forum.pfsense.org/index.php?topic=23.msg2391#msg2391
@@ -903,7 +903,7 @@ function custom_php_install_command() {
start_service("squid");
}
-function custom_php_deinstall_command() {
+function squid3_custom_php_deinstall_command() {
update_output_window("Stopping proxy service...");
stop_service("squid");
sleep(1);
diff --git a/config/squid-reverse/squid_ng.xml b/config/squid-reverse/squid_ng.xml
index 5d956387..142536d6 100644
--- a/config/squid-reverse/squid_ng.xml
+++ b/config/squid-reverse/squid_ng.xml
@@ -255,13 +255,13 @@
start_service("squid");
</custom_add_php_command_late>
<custom_php_install_command>
- custom_php_install_command();
+ squid3_custom_php_install_command();
write_static_squid_config();
mwexec("/usr/local/sbin/squid -k reconfigure");
start_service("squid");
</custom_php_install_command>
<custom_php_deinstall_command>
- custom_php_deinstall_command();
+ squid3_custom_php_deinstall_command();
stop_service("squid");
</custom_php_deinstall_command>
</packagegui>