diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-03 10:02:50 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-03 10:02:50 -0200 |
| commit | 55f02c3e35bb5e00625550ae66af3b645ca798ba (patch) | |
| tree | 3b37757a5dc313cd8c425467f0b00226954fdc93 /config | |
| parent | ccb3c5bd6e1a61e7ba39e3a3cf705d446c945ea9 (diff) | |
| parent | 0a791ef73373f9f0daecbcead95e93cf3ab31f39 (diff) | |
| download | pfsense-packages-55f02c3e35bb5e00625550ae66af3b645ca798ba.tar.gz pfsense-packages-55f02c3e35bb5e00625550ae66af3b645ca798ba.tar.bz2 pfsense-packages-55f02c3e35bb5e00625550ae66af3b645ca798ba.zip | |
Merge pull request #1128 from doktornotor/patch-12
Diffstat (limited to 'config')
| -rw-r--r-- | config/squid3/31/squid.inc | 8 | ||||
| -rwxr-xr-x | config/squid3/33/squid.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc index d565810c..df900e43 100644 --- a/config/squid3/31/squid.inc +++ b/config/squid3/31/squid.inc @@ -1854,8 +1854,8 @@ function squid_sync_on_changes() { $synctimeout = $squid_sync['synctimeout']; switch ($synconchanges){ case "manual": - if (is_array($squid_sync[row])){ - $rs=$squid_sync[row]; + if (is_array($squid_sync['row'])){ + $rs=$squid_sync['row']; } else{ log_error("[squid] xmlrpc sync is enabled but there is no hosts to push on squid config."); @@ -1863,8 +1863,8 @@ function squid_sync_on_changes() { } break; case "auto": - if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])){ - $system_carp=$config['installedpackages']['carpsettings']['config'][0]; + if (is_array($config['hasync'])) { + $system_carp = $config['hasync']; $rs[0]['ipaddress']=$system_carp['synchronizetoip']; $rs[0]['username']=$system_carp['username']; $rs[0]['password']=$system_carp['password']; diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc index 0f71def8..57b49d5f 100755 --- a/config/squid3/33/squid.inc +++ b/config/squid3/33/squid.inc @@ -2314,8 +2314,8 @@ function squid_sync_on_changes() { $synctimeout = $squid_sync['synctimeout']; switch ($synconchanges){ case "manual": - if (is_array($squid_sync[row])){ - $rs=$squid_sync[row]; + if (is_array($squid_sync['row'])){ + $rs=$squid_sync['row']; } else{ log_error("[squid] xmlrpc sync is enabled but there is no hosts to push on squid config."); @@ -2323,8 +2323,8 @@ function squid_sync_on_changes() { } break; case "auto": - if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])){ - $system_carp=$config['installedpackages']['carpsettings']['config'][0]; + if (is_array($config['hasync'])) { + $system_carp = $config['hasync']; $rs[0]['ipaddress']=$system_carp['synchronizetoip']; $rs[0]['username']=$system_carp['username']; $rs[0]['password']=$system_carp['password']; |