diff options
author | Phil Davis <phil.davis@inf.org> | 2015-06-15 14:19:11 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-06-15 14:19:11 +0545 |
commit | 6c07db487164262f9191ad02805523bd153e0ba6 (patch) | |
tree | 0c266356179ac730233a16c0e3767a0c22514c4d /usr/local/www/xmlrpc.php | |
parent | 67d9685607eef7c679fda929ad4855be1b2f9dec (diff) | |
download | pfsense-6c07db487164262f9191ad02805523bd153e0ba6.zip pfsense-6c07db487164262f9191ad02805523bd153e0ba6.tar.gz |
Code spacing
and other random stuff I noticed.
I think this finishes messing with code style. The codebase should match
the developer style guide closely enough that 99.9% of changes will not
feel the need to also massage the formatting.
Diffstat (limited to 'usr/local/www/xmlrpc.php')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index a0fb72a..5fd022a 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -246,7 +246,7 @@ function restore_config_section_xmlrpc($raw_params) { /* Log what happened */ $mergedkeys = implode(",", array_merge(array_keys($params[0]), $sync_full_done)); - write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys)); + write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."), $mergedkeys)); /* * The real work on handling the vips specially @@ -341,7 +341,7 @@ function merge_installedpackages_section_xmlrpc($raw_params) { } $config['installedpackages'] = array_merge($config['installedpackages'], $params[0]); $mergedkeys = implode(",", array_keys($params[0])); - write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys)); + write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."), $mergedkeys)); return $xmlrpc_g['return']['true']; } @@ -575,13 +575,13 @@ $server = new XML_RPC_Server( unlock($xmlrpclockkey); -function array_overlay($a1,$a2) { +function array_overlay($a1, $a2) { foreach ($a1 as $k => $v) { - if (!array_key_exists($k,$a2)) { + if (!array_key_exists($k, $a2)) { continue; } if (is_array($v) && is_array($a2[$k])) { - $a1[$k] = array_overlay($v,$a2[$k]); + $a1[$k] = array_overlay($v, $a2[$k]); } else { $a1[$k] = $a2[$k]; } |