diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2010-08-19 16:34:04 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2010-08-19 16:34:04 -0400 |
| commit | 5180d00ac2c9d47b2a74d4d8e7d0b9b762bc9934 (patch) | |
| tree | 47f521295b649233e8423cbdf49645de540d14e0 /etc/inc/zeromq.inc | |
| parent | bc87e826c88be0c597bc36c4f7601e5cfeff58e4 (diff) | |
| download | pfsense-5180d00ac2c9d47b2a74d4d8e7d0b9b762bc9934.zip pfsense-5180d00ac2c9d47b2a74d4d8e7d0b9b762bc9934.tar.gz | |
Use params array
Diffstat (limited to 'etc/inc/zeromq.inc')
| -rw-r--r-- | etc/inc/zeromq.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/zeromq.inc b/etc/inc/zeromq.inc index a548e45..3cb1843 100644 --- a/etc/inc/zeromq.inc +++ b/etc/inc/zeromq.inc @@ -211,7 +211,7 @@ function backup_config_section_zeromq($raw_params) { $params = $raw_params; if(zeromq_auth($raw_params) == false) return ZEROMQ_AUTH_FAIL; - $val = array_intersect_key($config, array_flip($params[0])); + $val = array_intersect_key($config, array_flip($params[3])); return serialize($val); } @@ -220,8 +220,8 @@ function restore_config_section_zeromq($raw_params) { $params = $raw_params; if(zeromq_auth($raw_params) == false) return ZEROMQ_AUTH_FAIL; - $config = array_merge($config, $params[0]); - $mergedkeys = implode(",", array_keys($params[0])); + $config = array_merge($config, $params[3]); + $mergedkeys = implode(",", array_keys($params[3])); write_config(sprintf(gettext("Merged in config (%s sections) from ZeroMQ client."),$mergedkeys)); return ZEROMQ_FASLE; } @@ -232,7 +232,7 @@ function merge_installedpackages_section_zeromq($raw_params) { if(zeromq_auth($raw_params) == false) return ZEROMQ_AUTH_FAIL; $config['installedpackages'] = array_merge($config['installedpackages'], $params[0]); - $mergedkeys = implode(",", array_keys($params[0])); + $mergedkeys = implode(",", array_keys($params[3])); write_config(sprintf(gettext("Merged in config (%s sections) from ZeroMQ client."),$mergedkeys)); return ZEROMQ_FASLE; } @@ -243,7 +243,7 @@ function merge_config_section_zeromq($raw_params) { if(zeromq_auth($raw_params) == false) return ZEROMQ_AUTH_FAIL; $config = array_merge_recursive_unique($config, $params[0]); - $mergedkeys = implode(",", array_keys($params[0])); + $mergedkeys = implode(",", array_keys($params[3])); write_config("Merged in config ({$mergedkeys} sections) from ZeroMQ client."); return ZEROMQ_FASLE; } |
