1 files changed, 237 insertions, 149 deletions

diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 073468e5..941395f6 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -39,8 +39,15 @@ require_once('service-utils.inc');
 
 if(!function_exists("filter_configure")) 
 	require_once("filter.inc");
-
-define('SQUID_CONFBASE', '/usr/local/etc/squid');
+	
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version > 2.0)
+	define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
+else
+  define('SQUID_LOCALBASE','/usr/local');
+  
+define('SQUID_CONFBASE', SQUID_LOCALBASE .'/etc/squid');
+define('SQUID_CONFFILE', SQUID_CONFBASE . '/squid.conf');
 define('SQUID_BASE', '/var/squid/');
 define('SQUID_ACLDIR', '/var/squid/acl');
 define('SQUID_PASSWD', '/var/etc/squid.passwd');
@@ -49,7 +56,11 @@ define('SQUID_SSL_DB','/var/squid/lib/ssl_db');
 
 $valid_acls = array();
 
-function sq_text_area_decode($text){
+$uname=posix_uname();
+if ($uname['machine']=='amd64')
+        ini_set('memory_limit', '250M');
+
+        function sq_text_area_decode($text){
 	return preg_replace('/\r\n/', "\n",base64_decode($text));	
 }
 
@@ -85,6 +96,11 @@ function squid_chown_recursive($dir, $user, $group) {
 /* setup cache */
 function squid_dash_z() {
 	global $config;
+
+	//Do nothing if there is no cache config
+	if (!is_array($config['installedpackages']['squidcache']['config']))
+		return;
+		
 	$settings = $config['installedpackages']['squidcache']['config'][0];
 
 	// If the cache system is null, there is no need to initialize the (irrelevant) cache dir.
@@ -102,12 +118,12 @@ function squid_dash_z() {
 
 	if(!is_dir($cachedir.'/00/')) {
 		log_error("Creating squid cache subdirs in $cachedir");
-		mwexec("/usr/local/sbin/squid -k shutdown");
+		mwexec(SQUID_LOCALBASE. "/sbin/squid -k shutdown -f " . SQUID_CONFFILE);
 		sleep(5);
-		mwexec("/usr/local/sbin/squid -k kill");
+		mwexec(SQUID_LOCALBASE. "/sbin/squid -k kill -f " . SQUID_CONFFILE);
 		// Double check permissions here, should be safe to recurse cache dir if it's small here.
 		mwexec("/usr/sbin/chown -R proxy:proxy $cachedir");
-		mwexec("/usr/local/sbin/squid -z");
+		mwexec(SQUID_LOCALBASE. "/sbin/squid -z -f " . SQUID_CONFFILE);
 	}
 
 	if(file_exists("/var/squid/cache/swap.state")) {
@@ -259,13 +275,17 @@ function squid_install_command() {
 	update_status("Creating squid cache pools... One moment please...");
 	squid_dash_z();
 	/* make sure pinger is executable */
-	if(file_exists("/usr/local/libexec/squid/pinger"))
-		exec("/bin/chmod a+x /usr/local/libexec/squid/pinger");
+	if(file_exists(SQUID_LOCALBASE. "/libexec/squid/pinger"))
+		exec("/bin/chmod a+x ". SQUID_LOCALBASE. "/libexec/squid/pinger");
 	if(file_exists("/usr/local/etc/rc.d/squid"))
 		exec("/bin/rm /usr/local/etc/rc.d/squid");
 	squid_write_rcfile();
 	if(file_exists("/usr/local/pkg/swapstate_check.php"))
 		exec("/bin/chmod a+x /usr/local/pkg/swapstate_check.php");
+	write_rcfile(array(
+		"file" => "sqp_monitor.sh",
+		"start" => "/usr/local/pkg/sqpmon.sh &",
+		"stop" => "ps awux | grep \"sqpmon\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill"));
 
 	foreach (array(	SQUID_CONFBASE,
 			SQUID_ACLDIR,
@@ -279,7 +299,7 @@ function squid_install_command() {
 	/* kill any running proxy alarm scripts */
 	update_status("Checking for running processes... One moment please...");
 	log_error("Stopping any running proxy monitors");
-	mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
+	mwexec("/usr/local/etc/rc.d/sqp_monitor.sh stop");
 	sleep(1);
 
 	if (!file_exists(SQUID_CONFBASE . '/mime.conf') && file_exists(SQUID_CONFBASE . '/mime.conf.default'))
@@ -291,16 +311,16 @@ function squid_install_command() {
 	if (!is_service_running('squid')) {
 		update_status("Starting... One moment please...");
 		log_error("Starting Squid");
-		mwexec_bg("/usr/local/sbin/squid -D");
+		mwexec_bg(SQUID_LOCALBASE. "/sbin/squid -f " . SQUID_CONFFILE);
 	} else {
 		update_status("Reloading Squid for configuration sync... One moment please...");
 		log_error("Reloading Squid for configuration sync");
-		mwexec("/usr/local/sbin/squid -k reconfigure");
+		mwexec(SQUID_LOCALBASE. "/sbin/squid -k reconfigure -f " . SQUID_CONFFILE);
 	}
 
 	/* restart proxy alarm scripts */
 	log_error("Starting a proxy monitor script");
-	mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh");
+	mwexec_bg("/usr/local/etc/rc.d/sqp_monitor.sh start");
 
 	update_status("Reconfiguring filter... One moment please...");
 	filter_configure();
@@ -310,7 +330,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...");
@@ -318,8 +341,8 @@ function squid_deinstall_command() {
 	mwexec('rm -rf $cachedir/swap.state');
 	mwexec('rm -rf $logdir');
 	update_status("Finishing package cleanup.");
-	mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh');
-	mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
+	mwexec("/usr/local/etc/rc.d/sqp_monitor.sh stop");
+	mwexec('rm -f /usr/local/etc/rc.d/sqp_monitor.sh');
 	mwexec("ps awux | grep \"squid\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
 	mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
 	mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
@@ -353,7 +376,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;
 
@@ -372,7 +398,7 @@ function squid_validate_general($post, $input_errors) {
 	$log_rotate = trim($post['log_rotate']);
 	if (!empty($log_rotate) && (!is_numeric($log_rotate) or ($log_rotate < 1)))
 
-		$input_errors[] = 'You must enter a valid number of days \'Log rotate\' field';
+		$input_errors[] = 'You must enter a valid number of days in the \'Log rotate\' field';
 
 	$webgui_port = $config['system']['webgui']['port'];
 	if(($config['system']['webgui']['port'] == "") && ($config['system']['webgui']['protocol'] == "http")) {
@@ -480,10 +506,18 @@ function squid_validate_nac($post, $input_errors) {
 	}
 
 	foreach (array(	'unrestricted_hosts', 'banned_hosts') as $hosts) {
-		foreach (explode("\n", $post[$hosts]) as $host) {
-			$host = trim($host);
-			if (!empty($host) && !is_ipaddr($host))
-				$input_errors[] = "The host '$host' is not a valid IP address";
+		
+		if (preg_match_all("@([0-9.]+)(/[0-9.]+|)@",$_POST[$hosts],$matches)){
+			for ($x=0;$x < count($matches[1]);$x++){
+				if ($matches[2][$x] == ""){
+					if (!is_ipaddr($matches[1][$x]))
+						$input_errors[] = "'{$matches[1][$x]}' is not a valid IP address";
+					}
+				else{
+					if (!is_subnet($matches[0][$x]))
+						$input_errors[] = "The subnet '{$matches[0][$x]}' is not a valid CIDR range";
+					}
+				}
 		}
 	}
 
@@ -536,7 +570,7 @@ function squid_validate_traffic($post, $input_errors) {
   if (!empty($post['quick_abort_pct'])) {		
 	 $value = trim($post['quick_abort_pct']);
      if (!is_numeric($value) || ($value > 100))
-	   $input_errors[] = "The field 'Finish when remaining %' must contain a percentaged value";	
+	   $input_errors[] = "The field 'Finish when remaining %' must contain a percentage";	
   }	
 }
 
@@ -656,24 +690,28 @@ 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;
 	foreach($config['cron']['item'] as $item) {
 		if(strstr($item['task_name'], "squid_rotate_logs")) {
-	
-	  $rotate_job_id = $x;
-	} elseif(strstr($item['task_name'], "squid_check_swapstate")) {
-	  $swapstate_job_id = $x;
+			$rotate_job_id = $x;
+		} elseif(strstr($item['task_name'], "squid_check_swapstate")) {
+	  		$swapstate_job_id = $x;
 		}
 		$x++;
 	}
 	$need_write = false;
 	switch($should_install) {
 		case true:
-		$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
-		if($rotate_job_id < 0) {
+			$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
+			if($rotate_job_id < 0) {
 				$cron_item = array();
 				$cron_item['task_name'] = "squid_rotate_logs";
 				$cron_item['minute'] = "0";
@@ -682,11 +720,12 @@ function squid_install_cron($should_install) {
 				$cron_item['month'] = "*";
 				$cron_item['wday'] = "*";
 				$cron_item['who'] = "root";
-				$cron_item['command'] = "/bin/rm {$cachedir}/swap.state; /usr/local/sbin/squid -k rotate";
+				$cron_item['command'] = "/bin/rm {$cachedir}/swap.state; ". SQUID_LOCALBASE."/sbin/squid -k rotate -f " . SQUID_CONFFILE;
+				/* Add this cron_item as a new entry at the end of the item array. */
 				$config['cron']['item'][] = $cron_item;
 				$need_write = true;
-				}
-				if($swapstate_job_id < 0) {
+			}
+			if($swapstate_job_id < 0) {
 				$cron_item = array();
 				$cron_item['task_name'] = "squid_check_swapstate";
 				$cron_item['minute'] = "*/15";
@@ -696,37 +735,40 @@ function squid_install_cron($should_install) {
 				$cron_item['wday'] = "*";
 				$cron_item['who'] = "root";
 				$cron_item['command'] = "/usr/local/pkg/swapstate_check.php";
+				/* Add this cron_item as a new entry at the end of the item array. */
 				$config['cron']['item'][] = $cron_item;
 				$need_write = true;
-				}
-				if ($need_write) {		
-				$config['cron']['item'][] = $cron_item;
+			}
+			if ($need_write) {		
 				parse_config(true);
 				write_config("Adding Squid Cron Jobs");
 			}
-		break;
+			break;
 		case false:
-		if($rotate_job_id >= 0) {
-			unset($config['cron']['item'][$rotate_job_id]);
-			$need_write = true;
-		}
-		if($swapstate_job_id >= 0) {
-			unset($config['cron']['item'][$swapstate_job_id]);
-			$need_write = true;
-		}
-		if ($need_write) {
-			parse_config(true);
-			write_config("Removing Squid Cron Jobs");
-		}
-		break;
+			if($rotate_job_id >= 0) {
+				unset($config['cron']['item'][$rotate_job_id]);
+				$need_write = true;
+			}
+			if($swapstate_job_id >= 0) {
+				unset($config['cron']['item'][$swapstate_job_id]);
+				$need_write = true;
+			}
+			if ($need_write) {
+				parse_config(true);
+				write_config("Removing Squid Cron Jobs");
+			}
+			break;
 	}
 	configure_cron();
-	}
+}
 
 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";
 
@@ -743,31 +785,33 @@ function squid_resync_general() {
 		$conf .= "http_port 127.0.0.1:" . $settings['proxy_port'] . " intercept\n";
 	}
 	$icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 7);
-
+	$dns_v4_first= ($settings['dns_v4_first'] == "on" ? "on" : "off" );
 	$pidfile = "{$g['varrun_path']}/squid.pid";
-	$language = ($settings['error_language'] ? $settings['error_language'] : 'English');
-	$errordir = SQUID_CONFBASE . '/errors/' . $language;
+	$language = ($settings['error_language'] ? $settings['error_language'] : 'en');
 	$icondir = SQUID_CONFBASE . '/icons';
 	$hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
 	$email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost');
 
 	$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
-
+	if (! is_dir($logdir)){
+		make_dirs($logdir);
+		squid_chown_recursive($logdir, 'proxy', 'proxy');
+		}
 	$logdir_cache = $logdir . '/cache.log';
 	$logdir_access = ($settings['log_enabled'] == 'on' ? $logdir . '/access.log' : '/dev/null');
 
 	$conf .= <<<EOD
-icp_port $icp_port
-
-pid_filename $pidfile
+icp_port {$icp_port}
+dns_v4_first {$dns_v4_first}
+pid_filename {$pidfile}
 cache_effective_user proxy
 cache_effective_group proxy
-error_directory $errordir
-icon_directory $icondir
-visible_hostname $hostname
-cache_mgr $email
-access_log $logdir_access
-cache_log $logdir_cache
+error_default_language {$language}
+icon_directory {$icondir}
+visible_hostname {$hostname}
+cache_mgr {$email}
+access_log {$logdir_access}
+cache_log {$logdir_cache}
 cache_store_log none
 sslcrtd_children 0
 
@@ -818,9 +862,11 @@ EOD;
 
 function squid_resync_cache() {
 	global $config, $g;
-
-	$settings = $config['installedpackages']['squidcache']['config'][0];
-
+	if (is_array($config['installedpackages']['squidcache']))
+		$settings = $config['installedpackages']['squidcache']['config'][0];
+	else
+		$settings = array();
+	//apply cache settings
 	$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
 	$disk_cache_size = ($settings['harddisk_cache_size'] ? $settings['harddisk_cache_size'] : 100);
 	$level1 = ($settings['level1_subdirs'] ? $settings['level1_subdirs'] : 16);
@@ -832,16 +878,15 @@ function squid_resync_cache() {
 	$memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF');
 	$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
 	$conf = '';
-	
 	if (!isset($settings['harddisk_cache_system'])) {
-		if ($g['platform'] == "nanobsd") {
+		if ($g['platform'] == "nanobsd" || !is_array ($config['installedpackages']['squidcache']['config']))
 			$disk_cache_system = 'null';
-		} else {
+		else
 			$disk_cache_system = 'ufs';
 		}
-	} else {
+	else{
 		$disk_cache_system = $settings['harddisk_cache_system'];
-	}
+		}
 	#'null' storage type dropped. In-memory cache is always present. Remove all cache_dir options to prevent on-disk caching.
 	if ($disk_cache_system != "null") {
 		$disk_cache_opts =	"cache_dir {$disk_cache_system} {$cachedir} {$disk_cache_size} {$level1} 256";
@@ -988,8 +1033,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'];
@@ -1042,18 +1090,18 @@ EOD;
 http_access allow manager localhost
 
 EOD;
-	if(!empty($settings['ext_cachemanager'])) {
-	  $extmgr = explode(";", ($settings['ext_cachemanager']));
-    $count = 1;
-    $conf .= "\n# Allow external cache managers\n";
-//    $conf .= "acl ext_manager src ".$settings['ext_cachemanager']."\n";
-	 foreach ($extmgr as $mgr) {
-    $conf .= "acl ext_manager_".$count." src ";
-    $conf .= $mgr." ";
-    $conf .= "\n";
-    $conf .= "http_access allow manager ext_manager_".$count."\n";
-    $count += 1;
-	 }}
+
+	if (is_array($config['installedpackages']['squidcache'])){
+		$settings_ch = $config['installedpackages']['squidcache']['config'][0];
+		if(!empty($settings_ch['ext_cachemanager'])) {
+	  		$extmgr = explode(";", ($settings_ch['ext_cachemanager']));
+    		$conf .= "\n# Allow external cache managers\n";
+	 		foreach ($extmgr as $mgr) {
+    			$conf .= "acl ext_manager src {$mgr}\n";
+	 			}
+	 		$conf .= "http_access allow manager ext_manager\n";
+			}
+		}
 	
   $conf .= <<<EOD
   
@@ -1073,14 +1121,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);
@@ -1168,10 +1223,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 = '';
 
@@ -1196,9 +1259,9 @@ function squid_resync_auth() {
 		}
 	}
 
-	// Unrestricted hosts take precendence over blacklist
+	// Unrestricted hosts take precedence over blacklist
 	if(! empty($settingsnac['unrestricted_hosts'])) {
-		if (squid_is_valid_acl('unrestricted_hosts')) {
+		if (squid_is_valid_acl('unrestricted_hosts') && $settings['unrestricted_auth']!= "on") {
 			$conf .= "# These hosts do not have any restrictions\n";
 			$conf .= "http_access allow unrestricted_hosts\n";
 		}
@@ -1210,7 +1273,7 @@ function squid_resync_auth() {
 		}
 	}
 
-	// Whitelist and blacklist also take precendence over other allow rules
+	// Whitelist and blacklist also take precedence over other allow rules
 	if(! empty($settingsnac['whitelist'])) {
 		if (squid_is_valid_acl('whitelist')) {
 			$conf .= "# Always allow access to whitelist domains\n";
@@ -1251,19 +1314,19 @@ function squid_resync_auth() {
 		$prompt = ($settings['auth_prompt'] ? $settings['auth_prompt'] : 'Please enter your credentials to access the proxy');
 		switch ($auth_method) {
 			case 'local':
-				$conf .= 'auth_param basic program /usr/local/libexec/squid/ncsa_auth ' . SQUID_PASSWD . "\n";
+				$conf .= 'auth_param basic program '.SQUID_LOCALBASE.'/libexec/squid/ncsa_auth ' . SQUID_PASSWD . "\n";
 				break;
 			case 'ldap':
 				$port = (isset($settings['auth_server_port']) ? ":{$settings['auth_server_port']}" : '');
 				$password = (isset($settings['ldap_pass']) ? "-w {$settings['ldap_pass']}" : '');
-				$conf .= "auth_param basic program /usr/local/libexec/squid/squid_ldap_auth -v {$settings['ldap_version']} -b {$settings['ldap_basedomain']} -D {$settings['ldap_user']} $password -f \"{$settings['ldap_filter']}\" -u {$settings['ldap_userattribute']} -P {$settings['auth_server']}$port\n";
+				$conf .= "auth_param basic program " . SQUID_LOCALBASE . "/libexec/squid/squid_ldap_auth -v {$settings['ldap_version']} -b {$settings['ldap_basedomain']} -D {$settings['ldap_user']} $password -f \"{$settings['ldap_filter']}\" -u {$settings['ldap_userattribute']} -P {$settings['auth_server']}$port\n";
 				break;
 			case 'radius':
 				$port = (isset($settings['auth_server_port']) ? "-p {$settings['auth_server_port']}" : '');
-				$conf .= "auth_param basic program /usr/local/libexec/squid/squid_radius_auth -w {$settings['radius_secret']} -h {$settings['auth_server']} $port\n";
+				$conf .= "auth_param basic program ". SQUID_LOCALBASE . "/libexec/squid/squid_radius_auth -w {$settings['radius_secret']} -h {$settings['auth_server']} $port\n";
 				break;
 			case 'msnt':
-				$conf .= "auth_param basic program /usr/local/libexec/squid/msnt_auth\n";
+				$conf .= "auth_param basic program ". SQUID_LOCALBASE . "/libexec/squid/msnt_auth\n";
 				squid_resync_msnt();
 				break;
 		}
@@ -1319,7 +1382,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'];
@@ -1340,6 +1406,9 @@ function squid_resync() {
 			$boot_process="on";
 	}
 	
+	if (is_process_running('squid') && isset($boot_process))
+		return;
+	
 	conf_mount_rw();
 	foreach (array(	SQUID_CONFBASE,
 			SQUID_ACLDIR,
@@ -1351,55 +1420,66 @@ function squid_resync() {
 		chgrp($dir, 'proxy');
 		squid_chown_recursive($dir, 'proxy', 'proxy');
 	}
-	if (!isset($boot_process)){
-		$conf = squid_resync_general() . "\n";
-		$conf .= squid_resync_cache() . "\n";
-		$conf .= squid_resync_redirector() . "\n";
-		$conf .= squid_resync_upstream() . "\n";
-		$conf .= squid_resync_nac() . "\n";
-		$conf .= squid_resync_traffic() . "\n";
-		$conf .= squid_resync_reverse() . "\n";	
-		$conf .= squid_resync_auth();
-		squid_resync_users();
-		squid_write_rcfile();
+	$conf = squid_resync_general() . "\n";
+	$conf .= squid_resync_cache() . "\n";
+	$conf .= squid_resync_redirector() . "\n";
+	$conf .= squid_resync_upstream() . "\n";
+	$conf .= squid_resync_nac() . "\n";
+	$conf .= squid_resync_traffic() . "\n";
+	$conf .= squid_resync_reverse() . "\n";	
+	$conf .= squid_resync_auth();
+	squid_resync_users();
+	squid_write_rcfile();
+		
+	if(!isset($boot_process))
 		squid_sync_on_changes();
-
-		#write config file
-		file_put_contents(SQUID_CONFBASE . '/squid.conf', $conf);
-		}
+	
+	#write config file
+	file_put_contents(SQUID_CONFBASE . '/squid.conf', $conf);
 		
 	/* make sure pinger is executable */
-	if(file_exists("/usr/local/libexec/squid/pinger"))
-		exec("chmod a+x /usr/local/libexec/squid/pinger");
-
-	$log_dir = $config['installedpackages']['squid']['config'][0]['log_dir'].'/';
-
-	if(!is_dir($log_dir)) {
-		log_error("Creating squid log dir $log_dir");
-		make_dirs($log_dir);
-		squid_chown_recursive($log_dir, 'proxy', 'proxy');
-	}
-
-	squid_dash_z();
-
+	if(file_exists(SQUID_LOCALBASE . "/libexec/squid/pinger"))
+		exec("chmod a+x " . SQUID_LOCALBASE . "/libexec/squid/pinger");
 	
-	if (!is_service_running('squid')) {
-		log_error("Starting Squid");
-		mwexec("/usr/local/sbin/squid");
-		} 
-	else {
-		if (!isset($boot_process)){
-			log_error("Reloading Squid for configuration sync");
-			mwexec("/usr/local/sbin/squid -k reconfigure");
+	$log_dir="";
+	#check if squid is enabled
+	if (is_array($config['installedpackages']['squid']['config'])){
+		if ($config['installedpackages']['squid']['config'][0]['active_interface']!= "")
+		$log_dir = $config['installedpackages']['squid']['config'][0]['log_dir'].'/';
+		}
+	#check if squidreverse is enabled
+	else if (is_array($config['installedpackages']['squidreversegeneral']['config'])){
+		if ($config['installedpackages']['squidreversegeneral']['config'][0]['reverse_interface'] != "")
+			$log_dir="/var/squid/logs/";
+		}
+	#do not start squid if there is no log dir
+	if ($log_dir != ""){
+		if(!is_dir($log_dir)) {
+			log_error("Creating squid log dir $log_dir");
+			make_dirs($log_dir);
+			squid_chown_recursive($log_dir, 'proxy', 'proxy');
 			}
+	
+		squid_dash_z();
+		
+		if (!is_service_running('squid')) {
+			log_error("Starting Squid");
+			mwexec(SQUID_LOCALBASE . "/sbin/squid -f " . SQUID_CONFFILE);
+			} 
+		else {
+			if (!isset($boot_process)){
+				log_error("Reloading Squid for configuration sync");
+				mwexec(SQUID_LOCALBASE . "/sbin/squid -k reconfigure -f " . SQUID_CONFFILE);
+				}
+		}
+	
+		// Sleep for a couple seconds to give squid a chance to fire up fully.
+		for ($i=0; $i < 10; $i++) {
+			if (!is_service_running('squid'))
+				sleep(1);
+		}
+		filter_configure();
 	}
-
-	// Sleep for a couple seconds to give squid a chance to fire up fully.
-	for ($i=0; $i < 10; $i++) {
-		if (!is_service_running('squid'))
-			sleep(1);
-	}
-	filter_configure();
 	conf_mount_ro();
 }
 
@@ -1701,16 +1781,21 @@ function squid_generate_rules($type) {
 }
 
 function squid_write_rcfile() {
+	/* Declare a variable for the SQUID_CONFFILE constant. */
+	/* Then the variable can be referenced easily in the Heredoc text that generates the rc file. */
+	$squid_conffile_var = SQUID_CONFFILE;
+	$squid_local_base = SQUID_LOCALBASE;
 	$rc = array();
 	$rc['file'] = 'squid.sh';
 	$rc['start'] = <<<EOD
 if [ -z "`ps auxw | grep "[s]quid "|awk '{print $2}'`" ];then
-	/usr/local/sbin/squid
+	{$squid_local_base}/sbin/squid -f {$squid_conffile_var}
 fi
 
 EOD;
+
 	$rc['stop'] = <<<EOD
-/usr/local/sbin/squid -k shutdown
+{$squid_local_base}/sbin/squid -k shutdown -f {$squid_conffile_var}
 # Just to be sure...
 sleep 5
 killall -9 squid 2>/dev/null
@@ -1719,14 +1804,15 @@ killall pinger 2>/dev/null
 EOD;
 	$rc['restart'] = <<<EOD
 if [ -z "`ps auxw | grep "[s]quid "|awk '{print $2}'`" ];then
-		/usr/local/sbin/squid
+		{$squid_local_base}/sbin/squid -f {$squid_conffile_var}
 	else
-		/usr/local/sbin/squid -k reconfigure
+		{$squid_local_base}/sbin/squid -k reconfigure -f {$squid_conffile_var}
 	fi
 
 EOD;
 	conf_mount_rw();
 	write_rcfile($rc);
+	conf_mount_ro();
 }
 
 /* Uses XMLRPC to synchronize the changes to a remote node */
@@ -1786,7 +1872,9 @@ function squid_do_xmlrpc_sync($sync_to_ip, $username, $password) {
 	$xml['squidcache'] = $config['installedpackages']['squidcache'];
 	$xml['squidnac'] = $config['installedpackages']['squidnac'];
 	$xml['squidtraffic'] = $config['installedpackages']['squidtraffic'];
-	$xml['squidreverse'] = $config['installedpackages']['squidreverse'];
+	$xml['squidreversegeneral'] = $config['installedpackages']['squidreversegeneral'];
+	$xml['squidreversepeer'] = $config['installedpackages']['squidreversepeer'];
+	$xml['squidreverseuri'] = $config['installedpackages']['squidreverseuri'];
 	$xml['squidauth'] = $config['installedpackages']['squidauth'];
 	$xml['squidusers'] = $config['installedpackages']['squidusers'];
 	/* assemble xmlrpc payload */
@@ -1820,10 +1908,10 @@ function squid_do_xmlrpc_sync($sync_to_ip, $username, $password) {
 		log_error("squid XMLRPC sync successfully completed with {$url}:{$port}.");
 	}
 	
-	/* tell squid to reload our settings on the destionation sync host. */
+	/* tell squid to reload our settings on the destination sync host. */
 	$method = 'pfsense.exec_php';
 	$execcmd  = "require_once('/usr/local/pkg/squid.inc');\n";
-	$execcmd .= "sync_package_squid();";
+	$execcmd .= "squid_resync();";
 	/* assemble xmlrpc payload */
 	$params = array(
 		XML_RPC_encode($password),